diff --git a/app/src/main/java/com/nynja/mobile/communicator/data/db/DbHelper.java b/app/src/main/java/com/nynja/mobile/communicator/data/db/DbHelper.java
index 6bd219c59cf4ae23d0093040071088fce5964318..2f4b3cf1d2bc01714f8925af22e07cf8911255b0 100644
--- a/app/src/main/java/com/nynja/mobile/communicator/data/db/DbHelper.java
+++ b/app/src/main/java/com/nynja/mobile/communicator/data/db/DbHelper.java
@@ -2087,10 +2087,12 @@ public class DbHelper {
                 cursor.close();
             }
         }
-        setMessageDesc(message);
-        checkStarMessage(message);
-        if (isAddReplied && message.isReply()) {
-            addRepliedToMessage(message);
+        if (message != null) {
+            setMessageDesc(message);
+            checkStarMessage(message);
+            if (isAddReplied && message.isReply()) {
+                addRepliedToMessage(message);
+            }
         }
         return message;
     }