Merge pull request #3540 from kumpera/abort-on-gerror