Fixes a NullPointerException in MclStorageManager which causes the contactlist to be recreated. The exception is thrown when a MSN account with hotmail.com is deleted by clicking the respective button in Tools > Options > Accounts.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
index 7ef6fe9..e75e21e 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java
@@ -1044,8 +1044,15 @@ public class MclStorageManager
         protoGroupElement.setAttribute(ACCOUNT_ID_ATTR_NAME, protoGroup
             .getProtocolProvider().getAccountID().getAccountUniqueID());
 
-        protoGroupElement.setAttribute(PARENT_PROTO_GROUP_UID_ATTR_NAME,
-            protoGroup.getParentContactGroup().getUID());
+        /*
+         * The Javadoc on ContactGroup#getParentContactGroup() states null may
+         * be returned. Prevent a NullPointerException.
+         */
+        ContactGroup parentContactGroup = protoGroup.getParentContactGroup();
+        if (parentContactGroup != null)
+            protoGroupElement.setAttribute(
+                    PARENT_PROTO_GROUP_UID_ATTR_NAME,
+                    parentContactGroup.getUID());
 
         // append persistent data child node
         String persistentData = protoGroup.getPersistentData();