diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
index b4d3f7554..abe18f630 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
@@ -258,6 +258,14 @@ public class DiscoverInfo extends IQ implements DiscoverInfoView {
         return features.contains(new Feature(feature));
     }
 
+    public static boolean nullSafeContainsFeature(DiscoverInfo discoverInfo, CharSequence feature) {
+        if (discoverInfo == null) {
+            return false;
+        }
+
+        return discoverInfo.containsFeature(feature);
+    }
+
     @Override
     protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml) {
         xml.optAttribute("node", getNode());