Moved ErrorHandler
Removed 80 character limit