diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs
index 6ab865922d..5d1f41f3f5 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpServer/HttpListener.cs
@@ -167,6 +167,9 @@ namespace OSHttpServer
                     break;
                 }
 
+                if(socket == null)
+                    continue;
+
                 socket.NoDelay = true;
                 try
                 {