#53 Restored Error handler