diff --git a/QGCSetup.pri b/QGCSetup.pri
index a032af3623ac53d21682477a40ba661e6305d886..49e55081daa0f1041e13815cdaa1f91b3f4c0113 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -110,9 +110,11 @@ LinuxBuild {
         libQt5Gui.so.5 \
         libQt5Location.so.5 \
         libQt5Multimedia.so.5 \
+        libQt5MultimediaQuick.so.5 \
         libQt5Network.so.5 \
         libQt5OpenGL.so.5 \
         libQt5Positioning.so.5 \
+        libQt5PositioningQuick.so.5 \
         libQt5PrintSupport.so.5 \
         libQt5Qml.so.5 \
         libQt5Quick.so.5 \
diff --git a/src/ui/MainWindowHybrid.qml b/src/ui/MainWindowHybrid.qml
index 408ea37a94b60bc4808c1467f4134a3d4b20facd..a320d9092132ebd755d0e078aa1358c7cc41ddc4 100644
--- a/src/ui/MainWindowHybrid.qml
+++ b/src/ui/MainWindowHybrid.qml
@@ -22,11 +22,19 @@ Item {
     }
 
     function attemptWindowClose() {
-        mainWindowInner.item.attemptWindowClose()
+        if(!mainWindowInner.item) {
+            controller.reallyClose()
+        } else {
+            mainWindowInner.item.attemptWindowClose()
+        }
     }
 
     function showMessage(message) {
-        mainWindowInner.item.showMessage(message)
+        if(mainWindowInner.item) {
+            mainWindowInner.item.showMessage(message)
+        } else {
+            console.log(message)
+        }
     }
 
     Loader {