The error handler deals with a message, so we tried to make it as close as possible to a normal error. But yeah, if it gets any more complex we should probably clean this up a bit.