From 997a016122218dd51ee0d2fb2ddac1c61fce455b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 23 Sep 2014 13:01:12 +0100
Subject: [PATCH] fix NPE

---
 webclient/components/matrix/event-handler-service.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 21066e3d9..9c19f306c 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -260,8 +260,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
             if (event.content.prev !== event.content.membership) {
                 memberChanges = "membership";
             }
-            else if (event.prev_content.displayname !== 
-                     event.content.displayname) {
+            else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) {
                 memberChanges = "displayname";
             }