removed error handler