diff --git a/src/crystal/system/socket.cr b/src/crystal/system/socket.cr
index de199376615b..552957bcff9a 100644
--- a/src/crystal/system/socket.cr
+++ b/src/crystal/system/socket.cr
@@ -53,6 +53,8 @@ module Crystal::System::Socket
 
   # private def system_linger=(val)
 
+  # private def system_getsockopt(fd, optname, optval, level = LibC::SOL_SOCKET, &)
+
   # private def system_getsockopt(fd, optname, optval, level = LibC::SOL_SOCKET)
 
   # private def system_setsockopt(fd, optname, optval, level = LibC::SOL_SOCKET)
diff --git a/src/crystal/system/unix/socket.cr b/src/crystal/system/unix/socket.cr
index 2b96cd6948f0..222ec7216fb9 100644
--- a/src/crystal/system/unix/socket.cr
+++ b/src/crystal/system/unix/socket.cr
@@ -203,11 +203,16 @@ module Crystal::System::Socket
     ret
   end
 
+  private def system_getsockopt(fd, optname, optval, level = LibC::SOL_SOCKET)
+    system_getsockopt(fd, optname, optval, level) { |value| return value }
+    raise ::Socket::Error.from_errno("getsockopt #{optname}")
+  end
+
   private def system_setsockopt(fd, optname, optval, level = LibC::SOL_SOCKET)
     optsize = LibC::SocklenT.new(sizeof(typeof(optval)))
 
     ret = LibC.setsockopt(fd, level, optname, pointerof(optval), optsize)
-    raise ::Socket::Error.from_errno("setsockopt") if ret == -1
+    raise ::Socket::Error.from_errno("setsockopt #{optname}") if ret == -1
     ret
   end
 
diff --git a/src/crystal/system/wasi/socket.cr b/src/crystal/system/wasi/socket.cr
index 71122ca46a33..add7b751eada 100644
--- a/src/crystal/system/wasi/socket.cr
+++ b/src/crystal/system/wasi/socket.cr
@@ -119,6 +119,10 @@ module Crystal::System::Socket
     raise NotImplementedError.new "Crystal::System::Socket#system_getsockopt"
   end
 
+  private def system_getsockopt(fd, optname, optval, level = LibC::SOL_SOCKET)
+    raise NotImplementedError.new "Crystal::System::Socket#system_getsockopt"
+  end
+
   private def system_setsockopt(fd, optname, optval, level = LibC::SOL_SOCKET)
     raise NotImplementedError.new "Crystal::System::Socket#system_setsockopt"
   end
diff --git a/src/crystal/system/win32/socket.cr b/src/crystal/system/win32/socket.cr
index ec814e0d20ce..136a107430f1 100644
--- a/src/crystal/system/win32/socket.cr
+++ b/src/crystal/system/win32/socket.cr
@@ -173,13 +173,13 @@ module Crystal::System::Socket
 
   private def system_bind(addr, addrstr, &)
     unless LibC.bind(fd, addr, addr.size) == 0
-      yield ::Socket::BindError.from_errno("Could not bind to '#{addrstr}'")
+      yield ::Socket::BindError.from_wsa_error("Could not bind to '#{addrstr}'")
     end
   end
 
   private def system_listen(backlog, &)
     unless LibC.listen(fd, backlog) == 0
-      yield ::Socket::Error.from_errno("Listen failed")
+      yield ::Socket::Error.from_wsa_error("Listen failed")
     end
   end
 
@@ -274,7 +274,7 @@ module Crystal::System::Socket
       ret = LibC.WSASendTo(fd, pointerof(wsabuf), 1, out bytes_sent, 0, addr, addr.size, overlapped, nil)
       {ret, bytes_sent}
     end
-    raise ::Socket::Error.from_errno("Error sending datagram to #{addr}") if bytes_written == -1
+    raise ::Socket::Error.from_wsa_error("Error sending datagram to #{addr}") if bytes_written == -1
 
     # to_i32 is fine because string/slice sizes are an Int32
     bytes_written.to_i32
@@ -302,13 +302,13 @@ module Crystal::System::Socket
 
   private def system_close_read
     if LibC.shutdown(fd, LibC::SH_RECEIVE) != 0
-      raise ::Socket::Error.from_errno("shutdown read")
+      raise ::Socket::Error.from_wsa_error("shutdown read")
     end
   end
 
   private def system_close_write
     if LibC.shutdown(fd, LibC::SH_SEND) != 0
-      raise ::Socket::Error.from_errno("shutdown write")
+      raise ::Socket::Error.from_wsa_error("shutdown write")
     end
   end
 
@@ -389,20 +389,19 @@ module Crystal::System::Socket
     val
   end
 
-  def system_getsockopt(handle, optname, optval, level = LibC::SOL_SOCKET, &)
+  private def system_getsockopt(handle, optname, optval, level = LibC::SOL_SOCKET, &)
     optsize = sizeof(typeof(optval))
     ret = LibC.getsockopt(handle, level, optname, pointerof(optval).as(UInt8*), pointerof(optsize))
-
-    if ret.zero?
-      yield optval
-    else
-      raise ::Socket::Error.from_wsa_error("getsockopt #{optname}")
-    end
-
+    yield optval if ret == 0
     ret
   end
 
-  def system_setsockopt(handle, optname, optval, level = LibC::SOL_SOCKET)
+  private def system_getsockopt(fd, optname, optval, level = LibC::SOL_SOCKET)
+    system_getsockopt(fd, optname, optval, level) { |value| return value }
+    raise ::Socket::Error.from_wsa_error("getsockopt #{optname}")
+  end
+
+  private def system_setsockopt(handle, optname, optval, level = LibC::SOL_SOCKET)
     optsize = sizeof(typeof(optval))
 
     ret = LibC.setsockopt(handle, level, optname, pointerof(optval).as(UInt8*), optsize)
@@ -491,7 +490,7 @@ module Crystal::System::Socket
       when Errno::EINTR, Errno::EINPROGRESS
         # ignore
       else
-        return ::Socket::Error.from_errno("Error closing socket")
+        return ::Socket::Error.from_wsa_error("Error closing socket")
       end
     end
   end
diff --git a/src/socket.cr b/src/socket.cr
index 86c75db86fb2..32a552fa34d4 100644
--- a/src/socket.cr
+++ b/src/socket.cr
@@ -345,8 +345,7 @@ class Socket < IO
 
   # Returns the modified *optval*.
   protected def getsockopt(optname, optval, level = LibC::SOL_SOCKET)
-    getsockopt(optname, optval, level) { |value| return value }
-    raise Socket::Error.from_errno("getsockopt")
+    system_getsockopt(fd, optname, optval, level)
   end
 
   protected def getsockopt(optname, optval, level = LibC::SOL_SOCKET, &)