diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
index 4023ec4a0..3cf01b2c2 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetContactCapabilitiesJabberImpl.java
@@ -477,7 +477,8 @@ public void contactPresenceStatusChanged(
         ContactPresenceStatusChangeEvent evt)
     {
         // If the user goes offline we ensure to remove the caps node.
-        if (evt.getNewStatus().getStatus() < PresenceStatus.ONLINE_THRESHOLD)
+        if (capsManager != null
+            && evt.getNewStatus().getStatus() < PresenceStatus.ONLINE_THRESHOLD)
             capsManager.removeUserCapsNode(evt.getSourceContact().getAddress());
     }
 }
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java
index 62d7ca0f9..d97e63ccc 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java
@@ -111,6 +111,14 @@ public ChatRoom createChatRoom(
             if (logger.isInfoEnabled())
                 logger.info("Find room returns null.");
 
+            // rooms using google servers needs a special name.
+            // in the form private-chat-UUID@groupchat.google.com
+            if(getXmppConnection().getHost().toLowerCase().contains("google"))
+            {
+                roomName = "private-chat-" +
+                        UUID.randomUUID().toString() + "@groupchat.google.com";
+            }
+
             MultiUserChat muc = null;
             try
             {
diff --git a/src/net/java/sip/communicator/util/NetworkUtils.java b/src/net/java/sip/communicator/util/NetworkUtils.java
index 4c8c9b0a6..7997bc3f2 100644
--- a/src/net/java/sip/communicator/util/NetworkUtils.java
+++ b/src/net/java/sip/communicator/util/NetworkUtils.java
@@ -750,7 +750,7 @@ private static String getProtocolFromNAPTRRecords(String service)
             return "UDP";
         else if(service.equalsIgnoreCase("SIP+D2T"))
             return "TCP";
-        else if(service.equalsIgnoreCase("SIP+D2TS"))
+        else if(service.equalsIgnoreCase("SIPS+D2T"))
             return "TLS";
         else
             return null;