From bb184c12a1b0abb5096f64f959e88b30d7775793 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 17 Dec 2015 11:56:41 +0000
Subject: [PATCH] fix NPE

---
 src/components/views/voip/IncomingCallBox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index b110d45043..a9601931bb 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -37,7 +37,7 @@ module.exports = React.createClass({
 
     render: function() {
 
-        var room = MatrixClientPeg.get().getRoom(this.props.incomingCall.roomId);
+        var room = this.props.incomingCall ? MatrixClientPeg.get().getRoom(this.props.incomingCall.roomId) : null;
         var caller = room ? room.name : "unknown";
         return (
             <div className="mx_IncomingCallBox" id="incomingCallBox">