diff --git a/NEWS b/NEWS
index 8430a155..85ac684f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@
 
 * Fixed #1362 - SUB socket sometimes fails to resubscribe properly.
 
+* Fixed #1377, #1144 - failed with WSANOTINITIALISED in some cases.
+
 
 0MQ version 4.0.5 stable, released on 2014/10/14
 ================================================
diff --git a/src/signaler.cpp b/src/signaler.cpp
index 506e85f9..cd05c663 100644
--- a/src/signaler.cpp
+++ b/src/signaler.cpp
@@ -146,12 +146,15 @@ zmq::signaler_t::~signaler_t ()
 #elif defined ZMQ_HAVE_WINDOWS
     struct linger so_linger = { 1, 0 };
     int rc = setsockopt (w, SOL_SOCKET, SO_LINGER,
-        (char *)&so_linger, sizeof (so_linger));
-    wsa_assert (rc != SOCKET_ERROR);
-    rc = closesocket (w);
-    wsa_assert (rc != SOCKET_ERROR);
-    rc = closesocket (r);
-    wsa_assert (rc != SOCKET_ERROR);
+        (const char *) &so_linger, sizeof so_linger);
+    //  Only check shutdown if WSASTARTUP was previously done
+    if (rc == 0 || WSAGetLastError () != WSANOTINITIALISED) {
+        wsa_assert (rc != SOCKET_ERROR);
+        rc = closesocket (w);
+        wsa_assert (rc != SOCKET_ERROR);
+        rc = closesocket (r);
+        wsa_assert (rc != SOCKET_ERROR);
+    }
 #else
     int rc = close_wait_ms (w);
     errno_assert (rc == 0);