Guard routing against a null-deref. Bug 1639