modified error handlers