diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 2494d5ba1fa64a5ad56413e51f6ae3ca89c311e5..6d4d797b58f23fce3826493c78e92e4e0b14da7d 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -335,6 +335,7 @@ void QGCApplication::_shutdown(void)
 QGCApplication::~QGCApplication()
 {
     // Place shutdown code in _shutdown
+    _app = NULL;
 }
 
 void QGCApplication::_initCommon(void)
diff --git a/src/QmlControls/AppMessages.cc b/src/QmlControls/AppMessages.cc
index dc9db5f07156b59fbe1506ca4e0cd370cb2f0433..fab8b7bd6e1fbaf012b66a9006b70f4da313d2d8 100644
--- a/src/QmlControls/AppMessages.cc
+++ b/src/QmlControls/AppMessages.cc
@@ -92,7 +92,8 @@ void AppLogModel::threadsafeLog(const QString message)
     insertRows(line, 1);
     setData(index(line), message, Qt::DisplayRole);
 
-    if (_logFile.fileName().isEmpty() && qgcApp()->logOutput()) {
+    if (qgcApp() && qgcApp()->logOutput() && _logFile.fileName().isEmpty()) {
+        qDebug() << _logFile.fileName().isEmpty() << qgcApp()->logOutput();
         QGCToolbox* toolbox = qgcApp()->toolbox();
         // Be careful of toolbox not being open yet
         if (toolbox) {
@@ -110,5 +111,6 @@ void AppLogModel::threadsafeLog(const QString message)
     if (_logFile.isOpen()) {
         QTextStream out(&_logFile);
         out << message << "\n";
+        _logFile.flush();
     }
 }