Send errors along correctly
Restore correct error handler functionality