Fix routing not quitting when asked to
Fix routing not quitting when asked to

jgoode/EDDiscovery,vendolis/EDDiscovery,jthorpe4/EDDiscovery,jeoffman/EDDiscovery,jgoode/EDDiscovery,jeoffman/EDDiscovery,vendolis/EDDiscovery,mwerle/EDDiscovery,mwerle/EDDiscovery