diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp
index d87ad423..86069c73 100644
--- a/cockatrice/src/window_main.cpp
+++ b/cockatrice/src/window_main.cpp
@@ -715,8 +715,11 @@ MainWindow::MainWindow(QWidget *parent)
 
 MainWindow::~MainWindow()
 {
-    trayIcon->hide();
-    trayIcon->deleteLater();
+    if (trayIcon) {
+        trayIcon->hide();
+        trayIcon->deleteLater();
+    }
+
     client->deleteLater();
     clientThread->wait();
 }