Changed arguments of error handler