Small fixed and tweaks to ErrorHandler