diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
index 3d8708b40..6bd71b33b 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
@@ -1478,6 +1478,9 @@ public void removeContactGroupFromMetaContactGroup(
         // if we failed to find the metagroup corresponding to proto group
         if(metaContainer == null)
         {
+            logger.warn(
+                "No meta container found, when trying to remove group: "
+                    + groupToRemove);
             return;
         }
 
@@ -2053,8 +2056,7 @@ private void handleProviderRemoved(
         ProtocolProviderService provider)
     {
         if (logger.isDebugEnabled())
-            logger.debug("Removing protocol provider "
-                     + provider.getProtocolName());
+            logger.debug("Removing protocol provider " + provider);
 
         this.currentlyInstalledProviders.
             remove(provider.getAccountID().getAccountUniqueID());
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java
index 3054e5d3f..eb7a8edf4 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java
@@ -308,6 +308,9 @@ public boolean equals(Object obj)
         if(!((ContactGroup)obj).getGroupName().equals(getGroupName()))
             return false;
 
+        if(getProtocolProvider() != ((ContactGroup)obj).getProtocolProvider())
+            return false;
+
         //since Jabber does not support having two groups with the same name
         // at this point we could bravely state that the groups are the same
         // and not bother to compare buddies. (gotta check that though)