Added more error handlers.