diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 1592e3839..6e8ea1c58 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -214,7 +214,7 @@ bool HttpServerConnection::ManageHeaders(HttpResponse& response)
 
 	Array::Ptr headerAllowOrigin = listener->GetAccessControlAllowOrigin();
 
-	if (headerAllowOrigin->GetLength() != 0) {
+	if (headerAllowOrigin && headerAllowOrigin->GetLength() != 0) {
 		String origin = m_CurrentRequest.Headers->Get("origin");
 		{
 			ObjectLock olock(headerAllowOrigin);