diff --git a/src/plugins/simulator/fs9/directplaypeer.cpp b/src/plugins/simulator/fs9/directplaypeer.cpp
index fd8ed2509..a109eeeda 100644
--- a/src/plugins/simulator/fs9/directplaypeer.cpp
+++ b/src/plugins/simulator/fs9/directplaypeer.cpp
@@ -41,7 +41,7 @@ namespace BlackSimPlugin
                 m_directPlayPeer->Release();
             }
 
-            if (m_deviceAddress) m_deviceAddress->Release();
+            SafeRelease(m_deviceAddress);
 
             CoUninitialize();
         }
diff --git a/src/plugins/simulator/fs9/fs9client.cpp b/src/plugins/simulator/fs9/fs9client.cpp
index 044082176..c8dada0db 100644
--- a/src/plugins/simulator/fs9/fs9client.cpp
+++ b/src/plugins/simulator/fs9/fs9client.cpp
@@ -122,8 +122,7 @@ namespace BlackSimPlugin
 
         CFs9Client::~CFs9Client()
         {
-            if (m_hostAddress) m_hostAddress->Release();
-            m_hostAddress = nullptr;
+            SafeRelease(m_hostAddress);
         }
 
         void CFs9Client::sendTextMessage(const QString &textMessage)
diff --git a/src/plugins/simulator/fs9/fs9host.cpp b/src/plugins/simulator/fs9/fs9host.cpp
index f7693795a..ba404bd30 100644
--- a/src/plugins/simulator/fs9/fs9host.cpp
+++ b/src/plugins/simulator/fs9/fs9host.cpp
@@ -56,10 +56,7 @@ namespace BlackSimPlugin
                 for (uint ii = 0; ii < dwNumAddresses; ++ii)
                 {
                     LPDIRECTPLAY8ADDRESS pAddress = addresses[ii];
-                    if (pAddress)
-                    {
-                        pAddress->Release();
-                    }
+                    SafeRelease(pAddress);
                 }
             }
             return address;
diff --git a/src/plugins/simulator/fs9/hostnode.cpp b/src/plugins/simulator/fs9/hostnode.cpp
index 05b60bd6d..a8d02ed18 100644
--- a/src/plugins/simulator/fs9/hostnode.cpp
+++ b/src/plugins/simulator/fs9/hostnode.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "hostnode.h"
+#include "directplayutils.h"
 
 namespace BlackSimPlugin
 {
@@ -25,10 +26,7 @@ namespace BlackSimPlugin
 
         CHostNode::~CHostNode()
         {
-            if (m_hostAddress)
-                m_hostAddress->Release();
-
-            m_hostAddress = nullptr;
+            SafeRelease(m_hostAddress);
         }
     }
 }
diff --git a/src/plugins/simulator/fs9/lobbyclient.cpp b/src/plugins/simulator/fs9/lobbyclient.cpp
index 991aac0c7..35f5f1e08 100644
--- a/src/plugins/simulator/fs9/lobbyclient.cpp
+++ b/src/plugins/simulator/fs9/lobbyclient.cpp
@@ -41,11 +41,8 @@ namespace BlackSimPlugin
                 m_directPlayPeer->Release();
             }
 
-            if (m_deviceAddress)
-                m_deviceAddress->Release();
-
-            if (m_hostAddress)
-                m_hostAddress->Release();
+            SafeRelease(m_deviceAddress);
+            SafeRelease(m_hostAddress);
 
             if (m_dpLobbyClient)
             {