Add few more error handlers