Fix minor error in ErrorHandler

Improve fatal error handling
Changes for code consistency
Merge pull request #65 from guiled/b/errorhandler

Fix minor error in ErrorHandler