Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse

Conflicts:
	webclient/room/room-controller.js

1 files changed, 6 insertions, 1 deletions

diff --git a/jsfiddles/event_stream/demo.js b/jsfiddles/event_stream/demo.js

index 5c81e08caa..acba8391fa 100644
--- a/jsfiddles/event_stream/demo.js
+++ b/jsfiddles/event_stream/demo.js
@@ -58,7 +58,12 @@ $('.login').live('click', function() {
             showLoggedIn(data);
         },
         error: function(err) {
-            alert(JSON.stringify($.parseJSON(err.responseText)));  
+            var errMsg = "To try this, you need a home server running!";
+            var errJson = $.parseJSON(err.responseText);
+            if (errJson) {
+                errMsg = JSON.stringify(errJson);   
+            }
+            alert(errMsg);  
         }
     }); 
 });