From 1f9c8efcca1054cf18c548cd2636312d9be1c0e1 Mon Sep 17 00:00:00 2001
From: liato <x@x00.us>
Date: Wed, 16 Mar 2011 04:26:17 +0100
Subject: [PATCH] Fix nullpointerexception.

---
 application/src/org/yaaic/activity/ConversationActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;