Removed error handler as it was causing problems in classes it was included in