Removed bad error handler