Added a constraint to work within.
Removed the double options for the error handler. Now to be only 'error'.