Quick error handlers fix