diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index e45ecfad..ba7e9b5e 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -1637,6 +1637,7 @@
                         }
                         case 'accountchange': {
                             // An account was created or changed
+                            if ((typeof message.event.account != 'object') || (message.event.account == null)) { console.log(message.event); return; };
                             if (userinfo.name == message.event.account.name) {
                                 var newsiteadmin = message.event.account.siteadmin ? message.event.account.siteadmin : 0;
                                 var oldsiteadmin = userinfo.siteadmin ? userinfo.siteadmin : 0;
diff --git a/views/default.handlebars b/views/default.handlebars
index bba9b51e..e5e8eaed 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -2693,6 +2693,7 @@
                         case 'accountcreate':
                         case 'accountchange': {
                             // An account was created or changed
+                            if ((typeof message.event.account != 'object') || (message.event.account == null)) console.log(message.event); return;
                             if (userinfo._id == message.event.account._id) {
                                 var newsiteadmin = message.event.account.siteadmin?message.event.account.siteadmin:0;
                                 var oldsiteadmin = userinfo.siteadmin?userinfo.siteadmin:0;