Renamed errorhandler to new name