Clean up special routing for commands to routers with errors

Should this also contain 'debug' as it does on scheduler.py L73 ?