diff --git a/src/commercial/jingle.jar b/src/commercial/jingle.jar
index a2b14f45..98b9a6ca 100644
Binary files a/src/commercial/jingle.jar and b/src/commercial/jingle.jar differ
diff --git a/src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/JinglePlugin.java b/src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/JinglePlugin.java
index dcff5eab..1451e063 100644
--- a/src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/JinglePlugin.java
+++ b/src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/JinglePlugin.java
@@ -37,14 +37,6 @@ import org.jivesoftware.spark.ui.TranscriptWindow;
 import org.jivesoftware.spark.util.SwingWorker;
 import org.jivesoftware.spark.util.log.Log;
 
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-import javax.swing.SwingUtilities;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Style;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
-
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -53,6 +45,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.SwingUtilities;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Style;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledDocument;
+
 
 /**
  * A simple Jingle Plugin for Spark that uses server Media Proxy for the transport and NAT Traversal
@@ -175,9 +175,15 @@ public class JinglePlugin implements Plugin, Phone {
                 Log.error(e);
             }
 
-            // Get the discovered items of the queried XMPP entity
-            supportsJingle = discoverInfo.containsFeature(JINGLE_NAMESPACE);
-            jingleFeature.put(jid, supportsJingle);
+            if (discoverInfo != null) {
+                // Get the discovered items of the queried XMPP entity
+                supportsJingle = discoverInfo.containsFeature(JINGLE_NAMESPACE);
+                jingleFeature.put(jid, supportsJingle);
+            }
+            else {
+                jingleFeature.put(jid, false);
+                supportsJingle = false;
+            }
         }
 
         if (!supportsJingle) {