--- a/src/com/beem/project/beem/ui/AddContact.java	Sun Jul 05 20:39:29 2009 +0200
+++ b/src/com/beem/project/beem/ui/AddContact.java	Sun Jul 05 20:47:57 2009 +0200
@@ -88,7 +88,8 @@
 		mGroup.add(getWidgetText(R.id.addc_group));
 	    if (valid) {
 		try {
-		    mGroup.addAll(xmppFacade.getRoster().getContact(mLogin).getGroups());
+		    if (xmppFacade.getRoster().getContact(mLogin) != null)
+			mGroup.addAll(xmppFacade.getRoster().getContact(mLogin).getGroups());
 		    if (xmppFacade.getRoster().addContact(mLogin, mAlias, mGroup.toArray(new String[mGroup.size()])) == null) {
 			Toast.makeText(AddContact.this, getString(R.string.AddCContactAddedError), Toast.LENGTH_SHORT)
 			    .show();

--- a/src/com/beem/project/beem/ui/ContactList.java	Sun Jul 05 20:39:29 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Sun Jul 05 20:47:57 2009 +0200
@@ -154,6 +154,7 @@
 		addContactInGroup(contact, DEFAULT_GROUP);
 	    }
 	}
+	Collections.sort(groupName);
 	mAdapter = new MyExpandableListAdapter();
 	setListAdapter(mAdapter);
     }