Clean up ErrorHandler

Authored by jbbgameich on Feb 20 2019, 5:56 PM.