NPE fix in DiscoveryNavigator. Thx to mpilone.