diff --git a/nymea-app/ui/customviews/GenericTypeGraph.qml b/nymea-app/ui/customviews/GenericTypeGraph.qml
index fa5ae35a..0ffacb48 100644
--- a/nymea-app/ui/customviews/GenericTypeGraph.qml
+++ b/nymea-app/ui/customviews/GenericTypeGraph.qml
@@ -314,7 +314,10 @@ Item {
                 }
 
                 function markClosestPoint(point) {
-                    var found = false;
+                    if (lineSeries1.count == 0) {
+                        return;
+                    }
+
                     if (lineSeries1.count == 1) {
                         selectedHighlights.removePoints(0, selectedHighlights.count)
                         selectedHighlights.append(lineSeries1.at(0).x, lineSeries1.at(1).y)
diff --git a/nymea-app/ui/delegates/InterfaceTile.qml b/nymea-app/ui/delegates/InterfaceTile.qml
index 65575275..b9b71d69 100644
--- a/nymea-app/ui/delegates/InterfaceTile.qml
+++ b/nymea-app/ui/delegates/InterfaceTile.qml
@@ -54,7 +54,11 @@ MainPageTile {
         var page;
         // Only one item? Go streight to the thing page
         if (devicesProxy.count === 1) {
-            page = NymeaUtils.interfaceListToDevicePage([iface.name]);
+            if (!iface) {
+                page = "GenericDevicePage.qml";
+            } else {
+                page = NymeaUtils.interfaceListToDevicePage([iface.name]);
+            }
             pageStack.push(Qt.resolvedUrl("../devicepages/" + page), {thing: devicesProxy.get(0)})
             return;
         }