1 files changed, 2 insertions, 4 deletions
diff --git a/wocky/wocky-muc.c b/wocky/wocky-muc.c
index f23c72a..86a55cc 100644
--- a/wocky/wocky-muc.c
+++ b/wocky/wocky-muc.c
@@ -1333,9 +1333,6 @@ extract_timestamp (WockyNode *msg)
         }
     }
 
-  if (stamp == NULL)
-    stamp = g_date_time_new_from_unix_local (0);
-
   return stamp;
 }
 
@@ -1443,7 +1440,8 @@ handle_message (WockyPorter *porter,
   if (member_is_temporary)
     free_member (who);
 
-  g_date_time_unref (datetime);
+  if (datetime != NULL)
+    g_date_time_unref (datetime);
 
   return TRUE;
 }