diff --git a/lib/web/Close-IcingaTCPConnection.psm1 b/lib/web/Close-IcingaTCPConnection.psm1
index 81388ae..86beeae 100644
--- a/lib/web/Close-IcingaTCPConnection.psm1
+++ b/lib/web/Close-IcingaTCPConnection.psm1
@@ -11,7 +11,7 @@ function Close-IcingaTCPConnection()
     Write-IcingaDebugMessage -Message (
         [string]::Format(
             'Closing client connection for endpoint {0}',
-            $Client.Client.RemoteEndPoint
+            (Get-IcingaTCPClientRemoteEndpoint -Client $Client)
         )
     );
 
diff --git a/lib/web/Get-IcingaTCPClientRemoteEndpoint.psm1 b/lib/web/Get-IcingaTCPClientRemoteEndpoint.psm1
new file mode 100644
index 0000000..28f3215
--- /dev/null
+++ b/lib/web/Get-IcingaTCPClientRemoteEndpoint.psm1
@@ -0,0 +1,12 @@
+function Get-IcingaTCPClientRemoteEndpoint()
+{
+    param(
+        [System.Net.Sockets.TcpClient]$Client = $null
+    );
+
+    if ($null -eq $Client) {
+        return 'unknown';
+    }
+
+    return $Client.Client.RemoteEndPoint;
+}
diff --git a/lib/web/New-IcingaTCPClient.psm1 b/lib/web/New-IcingaTCPClient.psm1
index e3256ec..607ca1b 100644
--- a/lib/web/New-IcingaTCPClient.psm1
+++ b/lib/web/New-IcingaTCPClient.psm1
@@ -13,7 +13,7 @@ function New-IcingaTCPClient()
     Write-IcingaDebugMessage -Message (
         [string]::Format(
             'New incoming client connection for endpoint {0}',
-            $Client.Client.RemoteEndPoint
+            (Get-IcingaTCPClientRemoteEndpoint -Client $Client)
         )
     );