diff --git a/src/main/java/com/ibm/disni/RdmaServerEndpoint.java b/src/main/java/com/ibm/disni/RdmaServerEndpoint.java
index 1ea98844..244830bf 100644
--- a/src/main/java/com/ibm/disni/RdmaServerEndpoint.java
+++ b/src/main/java/com/ibm/disni/RdmaServerEndpoint.java
@@ -130,8 +130,12 @@ public C accept() throws IOException {
 				}
 			}
 			C endpoint = requested.poll();
-			logger.info("connect request received");
-			endpoint.accept();
+
+			// a null endpoint gets returned if listening endpoint closes
+			if (endpoint != null) {
+				logger.info("connect request received");
+				endpoint.accept();
+			}
 			return endpoint;
 		} catch (Exception e) {
 			throw new IOException(e);