diff --git a/src/QGCSingleton.h b/src/QGCSingleton.h
index fdcc140cc0fe179a59710d5055842890ffdc8d27..7a2edd66365cd8ffd9c08cf56ae0615ad06c188f 100644
--- a/src/QGCSingleton.h
+++ b/src/QGCSingleton.h
@@ -78,7 +78,7 @@
     interfaceName* className::instance(bool nullOk) \
     { \
         if (!nullOk) { \
-            Q_ASSERT_X(_instance, "QGCSingleton", "If you hit this, then you have run into a startup or shutdown sequence bug."); \
+            Q_ASSERT_X(_instance, "QGCSingleton", "Request for singleton that is NULL. If you hit this, then you have likely run into a startup or shutdown sequence bug (possibly intermittent)."); \
         } \
         return _instance; \
     } \
diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc
index bf86c3bdc02b7b559e8e6de9c511f2daf3e1eeb5..e7910a5c36d470d58aa2edc49881497230659445 100644
--- a/src/comm/MAVLinkProtocol.cc
+++ b/src/comm/MAVLinkProtocol.cc
@@ -198,17 +198,6 @@ void MAVLinkProtocol::_linkStatusChanged(LinkInterface* link, bool connected)
             _stopLogging();
         }
     }
-    
-    // Track the links which are connected to the protocol
-    QList<LinkInterface*> _connectedLinks;  ///< List of all links connected to protocol
-
-    //qDebug() << "linkStatusChanged" << connected;
-    
-
-    if (link) {
-        if (connected) {
-        }
-    }
 }
 
 /**
@@ -294,9 +283,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
 
             // Log data
             
-            Q_ASSERT(_logSuspendError || _logSuspendReplay || _tempLogFile.isOpen());
-            
-            if (!_logSuspendError && !_logSuspendReplay) {
+            if (!_logSuspendError && !_logSuspendReplay && _tempLogFile.isOpen()) {
                 uint8_t buf[MAVLINK_MAX_PACKET_LEN+sizeof(quint64)];
 
                 // Write the uint64 time in microseconds in big endian format before the message.