diff --git a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
index ea2f8f4d6..acffd409f 100644
--- a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
+++ b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
@@ -248,6 +248,9 @@ public class ServiceDiscoveryManager {
      * to a given node.
      */
     private NodeInformationProvider getNodeInformationProvider(String node) {
+        if (node == null) {
+            return null;
+        }
         return (NodeInformationProvider) nodeInformationProviders.get(node);
     }