diff --git a/src/java/org/jivesoftware/spark/ChatManager.java b/src/java/org/jivesoftware/spark/ChatManager.java
index 7b95d5ce..4f783357 100644
--- a/src/java/org/jivesoftware/spark/ChatManager.java
+++ b/src/java/org/jivesoftware/spark/ChatManager.java
@@ -801,6 +801,10 @@ public class ChatManager implements MessageEventNotificationListener {
      * @param arguments the arguments passed into Spark.
      */
     public void handleURIMapping(String arguments) {
+        if(arguments == null){
+            return;
+        }
+        
         if (arguments.indexOf("xmpp") == -1) {
             return;
         }