Relocating error handlers