Adding more error handlers