Fix ErrorHandler
Merge pull request #3612 from gonimar/patch-16

Fix ErrorHandler