Yet more fixes for error handlers.