diff --git a/gui/app.js b/gui/app.js
index 78b23e79..0df76335 100644
--- a/gui/app.js
+++ b/gui/app.js
@@ -233,6 +233,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
     };
 
     $scope.nodeName = function (nodeCfg) {
+        if (typeof nodeCfg === 'undefined') {
+            return "";
+        }
         if (nodeCfg.Name) {
             return nodeCfg.Name;
         }
diff --git a/gui/index.html b/gui/index.html
index d3652438..1dc1ac0e 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -389,7 +389,7 @@
         <div class="well well-sm text-monospace text-center">
           {{myID | chunkID}}
         </div>
-        <img class="center-block img-thumbnail" src="qr/{{myID | chunkID}}"/>
+        <img ng-if="myID" class="center-block img-thumbnail" src="qr/{{myID | chunkID}}"/>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;Close</button>