1 files changed, 5 insertions, 2 deletions
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
index da33625e498d..f9b375a78c76 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
@@ -155,8 +155,11 @@ public final class socketAcceptor implements XAcceptor {
             if (tcpNoDelay != null) {
                 socket.setTcpNoDelay(tcpNoDelay.booleanValue());
             }
-            else if (((InetSocketAddress)socket.getRemoteSocketAddress()).getAddress().isLoopbackAddress()) {
-                socket.setTcpNoDelay(true);
+            else {
+                InetSocketAddress address = (InetSocketAddress)socket.getRemoteSocketAddress();
+                if (address != null && address.getAddress().isLoopbackAddress()) {
+                    socket.setTcpNoDelay(true);
+                }
             }
             return new SocketConnection(acceptingDescription, socket);
         }