diff --git a/Source/GSFileHandle.m b/Source/GSFileHandle.m
index 8409349a4..c2a7382cc 100644
--- a/Source/GSFileHandle.m
+++ b/Source/GSFileHandle.m
@@ -747,8 +747,10 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
 	{
 	  if (!GSWOULDBLOCK)
 	    {
+	      NSError	*e = [NSError _last];
+
 	      NSLog(@"unable to make connection to %@ - %@",
-		GSPrivateSockaddrName(&sin), [NSError _last]);
+		GSPrivateSockaddrName(&sin), e);
 	      DESTROY(self);
 	      return nil;
 	    }
@@ -829,8 +831,10 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
 
   if (bind(net, &sin, GSPrivateSockaddrLength(&sin)) == -1)
     {
+      NSError	*e = [NSError _last];
+
       NSLog(@"unable to bind to port %@ - %@",
-	GSPrivateSockaddrName(&sin), [NSError _last]);
+	GSPrivateSockaddrName(&sin), e);
       (void) close(net);
       DESTROY(self);
       return nil;
diff --git a/Source/GSNetwork.h b/Source/GSNetwork.h
index cd7709b3c..13f0caf58 100644
--- a/Source/GSNetwork.h
+++ b/Source/GSNetwork.h
@@ -70,8 +70,10 @@
 #define INVALID_SOCKET  -1
 #define BADSOCKET(X)    ((X) < 0)
 #define GSNETERROR      errno
-#define GSWOULDBLOCK    (EINPROGRESS == GSNETERROR\
- || EALREADY == GSNETERROR || EAGAIN == errno)
+#define GSWOULDBLOCK    (EINPROGRESS == errno\
+ || EALREADY == errno\
+ || EINTR == errno\
+ || EAGAIN == errno)
 
 #endif  /* __MINGW__ */