Move error handler back into the proper module.