--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Mon Jun 22 13:54:32 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Mon Jun 22 15:37:33 2009 +0200
@@ -284,7 +284,8 @@
      */
     @Override
     public boolean disconnect() {
-	mAdaptee.disconnect();
+	if (mAdaptee != null && mAdaptee.isConnected())
+	    mAdaptee.disconnect();
 	return true;
     }