Updated Error Handler

• Added testing
• Handle unknown errorrs better