diff --git a/libnymea-app/models/tagsproxymodel.h b/libnymea-app/models/tagsproxymodel.h
index 86c2d6b4..c6932d12 100644
--- a/libnymea-app/models/tagsproxymodel.h
+++ b/libnymea-app/models/tagsproxymodel.h
@@ -43,8 +43,8 @@ class TagsProxyModel : public QSortFilterProxyModel
 public:
     explicit TagsProxyModel(QObject *parent = nullptr);
 
-    Tags* tags() const;
-    void setTags(Tags* tags);
+    Tags *tags() const;
+    void setTags(Tags *tags);
 
     QString filterTagId() const;
     void setFilterTagId(const QString &filterTagId);
diff --git a/nymea-app/ui/delegates/InterfaceTile.qml b/nymea-app/ui/delegates/InterfaceTile.qml
index 6c587b22..b9f25472 100644
--- a/nymea-app/ui/delegates/InterfaceTile.qml
+++ b/nymea-app/ui/delegates/InterfaceTile.qml
@@ -233,7 +233,11 @@ MainPageTile {
                     var d = thingsProxy.get(i);
                     var st = d.thingClass.stateTypes.findByName("playbackStatus")
                     var s = d.states.getState(st.id)
-                    s.valueChanged.connect(function() {inlineMediaControl.updateTile()})
+                    s.valueChanged.connect(function() {
+                        if (inlineMediaControl) {
+                            inlineMediaControl.updateTile()
+                        }
+                    })
                 }
                 updateTile();
             }