diff --git a/application/src/org/yaaic/activity/ConversationActivity.java b/application/src/org/yaaic/activity/ConversationActivity.java
index 430c783..1632713 100644
--- a/application/src/org/yaaic/activity/ConversationActivity.java
+++ b/application/src/org/yaaic/activity/ConversationActivity.java
@@ -395,7 +395,7 @@ public class ConversationActivity extends Activity implements ServiceConnection,
         while(conversation.hasBufferedMessages()) {
             Message message = conversation.pollBufferedMessage();
 
-            if (adapter != null) {
+            if (adapter != null && message != null) {
                 adapter.addMessage(message);
                 int status;