refactored the error controller
updated for 2.1.1 release