From be4d687a8650e549ae3c1417b766ee36ded1245c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Wed, 9 Dec 2015 09:46:45 +0100
Subject: [PATCH] Fix problem with handling of old db entries in mod_mam

---
 src/mod_mam.erl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index cfc1e213f..89b8ddadd 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -712,9 +712,10 @@ select(LServer, #jid{luser = LUser} = JidRequestor,
 		       #xmlel{} = El = xml_stream:parse_element(XML),
 		       Now = usec_to_now(jlib:binary_to_integer(TS)),
 		       PeerJid = jid:tolower(jid:from_string(PeerBin)),
-		       T = if Kind /= <<"">> ->
-				   jlib:binary_to_atom(Kind);
-			      true -> chat
+		       T = case Kind of
+                               <<"">> -> chat;
+                               null -> chat;
+                               _ -> jlib:binary_to_atom(Kind)
 			   end,
 		       {TS, jlib:binary_to_integer(TS),
 			msg_to_el(#archive_msg{timestamp = Now,
-- 
2.49.0