Error handler fix.