--- a/src/com/beem/project/beem/service/RosterAdapter.java	Thu Mar 18 02:43:55 2010 +0100
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Thu Mar 18 02:50:39 2010 +0100
@@ -388,8 +388,6 @@
 		    }
 		    listener.onPresenceChanged(new PresenceAdapter(presence));
 		} catch (RemoteException e) {
-		    // The RemoteCallbackList will take care of removing the
-		    // dead listeners.
 		    Log.w(TAG, "Error while updating roster presence entries", e);
 		}
 	    }

--- a/src/com/beem/project/beem/ui/ContactList.java	Thu Mar 18 02:43:55 2010 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Thu Mar 18 02:50:39 2010 +0100
@@ -246,7 +246,7 @@
 		    break;
 		default:
 		    result = super.onContextItemSelected(item);
-		break;
+		    break;
 	    }
 	    return result;
 	}
@@ -833,6 +833,11 @@
     @Override
     protected void finalize() {
 	Log.e(TAG, "FINALIZE");
+	try {
+	    super.finalize();
+	} catch (Throwable e) {
+	    e.printStackTrace();
+	}
     }
 
     /**