diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp
index 9bd25a270..f5327a486 100644
--- a/src/cpp/ripple/WSDoor.cpp
+++ b/src/cpp/ripple/WSDoor.cpp
@@ -111,7 +111,11 @@ void WSDoor::stop()
 {
 	if (mThread)
 	{
-		mEndpoint->stop();
+		if (mEndpoint)
+			mEndpoint->stop();
+		if (mSEndpoint)
+			mSEndpoint->stop();
+
 
 		mThread->join();
 	}