1 files changed, 4 insertions, 0 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 3adcbbade..e69ebbbe9 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -801,6 +801,9 @@ void KSMServer::newConnection( int /*socket*/ )
 {
     IceAcceptStatus status;
     IceConn iceConn = IceAcceptConnection( ((KSMListener*)sender())->listenObj, &status);
+    if (iceConn == NULL) {
+        return;
+    }
     IceSetShutdownNegotiation( iceConn, False );
     IceConnectStatus cstatus;
     while ((cstatus = IceConnectionStatus (iceConn))==IceConnectPending) {
@@ -813,6 +816,7 @@ void KSMServer::newConnection( int /*socket*/ )
         else
             kdDebug( 1218 ) << "ICE Connection rejected!" << endl;
         (void )IceCloseConnection (iceConn);
+        return;
     }
 }