diff --git a/app/SysTray-X/SysTray-X.qrc b/app/SysTray-X/SysTray-X.qrc
index 0be4112..31354b2 100644
--- a/app/SysTray-X/SysTray-X.qrc
+++ b/app/SysTray-X/SysTray-X.qrc
@@ -11,5 +11,6 @@
         <file>files/icons/window-restore.png</file>
         <file>files/icons/mail-unread.png</file>
         <file>files/icons/help-about.png</file>
+        <file>files/icons/dialog-warning.png</file>
     </qresource>
 </RCC>
diff --git a/app/SysTray-X/files/icons/dialog-warning.png b/app/SysTray-X/files/icons/dialog-warning.png
new file mode 100644
index 0000000..76adf78
Binary files /dev/null and b/app/SysTray-X/files/icons/dialog-warning.png differ
diff --git a/app/SysTray-X/systrayx.cpp b/app/SysTray-X/systrayx.cpp
index b7fe2c5..843efd7 100644
--- a/app/SysTray-X/systrayx.cpp
+++ b/app/SysTray-X/systrayx.cpp
@@ -419,7 +419,10 @@ void    SysTrayX::slotAddOnShutdown()
     /*
      *  Hide systray icon to prevent ghost systray icon in Windows
      */
-    m_tray_icon->hide();
+    if( m_tray_icon )
+    {
+        m_tray_icon->hide();
+    }
 
     /*
      *  Close the TB window
@@ -448,7 +451,10 @@ void    SysTrayX::slotShutdown()
         /*
          *  Hide systray icon to prevent ghost systray icon in Windows
          */
-        m_tray_icon->hide();
+        if( m_tray_icon )
+        {
+            m_tray_icon->hide();
+        }
 
         /*
          *  Close the TB window
@@ -494,5 +500,10 @@ void    SysTrayX::slotVersion( QString version )
             m_tray_icon->showMessage("SysTray-X Warning", "Version mismatch addon and app",
                 QSystemTrayIcon::Warning );
         }
+
+        if( m_tray_icon2 )
+        {
+            m_tray_icon2->showMessage("SysTray-X Warning", "Version mismatch addon and app", ":/files/icons/dialog-warning.png" );
+        }
     }
 }