Added one more error handler