diff --git a/include/SocketBase.hpp b/include/SocketBase.hpp
index 622b4c0..e14bd72 100644
--- a/include/SocketBase.hpp
+++ b/include/SocketBase.hpp
@@ -22,6 +22,7 @@ class SocketBase {
         bool closeSocket();
 
         void setName(const char *name) {strcpy(sockName, name);};
+        u32 socket_errno;
 
     protected:
         s32 socket_log(const char* str);
diff --git a/include/nn/socket.h b/include/nn/socket.h
index 2fc4b6d..b308e33 100644
--- a/include/nn/socket.h
+++ b/include/nn/socket.h
@@ -34,4 +34,6 @@ s32 Recv(s32 socket, void* out, ulong outLen, s32 flags);
 u16 InetHtons(u16 val);
 s32 InetAton(const char* addressStr, in_addr* addressOut);
 
+u32 GetLastErrno();
+
 } }
diff --git a/source/main.cpp b/source/main.cpp
index 49b0d07..bc184df 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -89,6 +89,7 @@ void drawMainHook(HakoniwaSequence *curSequence, sead::Viewport *viewport, sead:
     gTextWriter->setScaleFromFontHeight(20.f);
 
     gTextWriter->printf("Client Socket Connection Status: %s\n", Client::sInstance->mSocket->getStateChar());
+    gTextWriter->printf("nn::socket::GetLastErrno: 0x%x\n", Client::sInstance->mSocket->socket_errno);
     gTextWriter->printf("Packet Queue Length: %d\n", Client::sInstance->mSocket->mPacketQueue.size());
     gTextWriter->printf("Total Connected Players: %d\n", Client::getConnectCount() + 1);
 
diff --git a/source/server/SocketClient.cpp b/source/server/SocketClient.cpp
index 7943ec1..4e720e0 100644
--- a/source/server/SocketClient.cpp
+++ b/source/server/SocketClient.cpp
@@ -30,6 +30,7 @@ nn::Result SocketClient::init(const char* ip, u16 port) {
     if (!nn::nifm::IsNetworkAvailable()) {
         Logger::log("Network Unavailable.\n");
         this->socket_log_state = SOCKET_LOG_UNAVAILABLE;
+        this->socket_errno = nn::socket::GetLastErrno();
         return -1;
     }
     #endif
@@ -38,6 +39,7 @@ nn::Result SocketClient::init(const char* ip, u16 port) {
 
         Logger::log("Socket Unavailable.\n");
 
+        this->socket_errno = nn::socket::GetLastErrno();
         this->socket_log_state = SOCKET_LOG_UNAVAILABLE;
         return -1;
     }
@@ -56,6 +58,7 @@ nn::Result SocketClient::init(const char* ip, u16 port) {
     nn::Result result;
     
     if((result = nn::socket::Connect(this->socket_log_socket, &serverAddress, sizeof(serverAddress))).isFailure()) {
+        this->socket_errno = nn::socket::GetLastErrno();
         this->socket_log_state = SOCKET_LOG_UNAVAILABLE;
         return result;
     }
@@ -81,6 +84,7 @@ bool SocketClient::SEND(Packet *packet) {
         return true;
     } else {
         Logger::log("Failed to Fully Send Packet! Result: %d Type: %s Packet Size: %d\n", valread, packetNames[packet->mType], packet->mPacketSize);
+        this->socket_errno = nn::socket::GetLastErrno();
         this->closeSocket();
         return false;
     }
@@ -91,6 +95,7 @@ bool SocketClient::RECV() {
 
     if (this->socket_log_state != SOCKET_LOG_CONNECTED) {
         Logger::log("Unable To Recieve! Socket Not Connected.\n");
+        this->socket_errno = nn::socket::GetLastErrno();
         return false;
     }
     
@@ -105,6 +110,7 @@ bool SocketClient::RECV() {
             valread += result;
         } else {
             Logger::log("Header Read Failed! Value: %d Total Read: %d\n", result, valread);
+        this->socket_errno = nn::socket::GetLastErrno();
             this->closeSocket();
             return false;
         }
@@ -132,6 +138,7 @@ bool SocketClient::RECV() {
                     }else {
                         free(packetBuf);
                         Logger::log("Packet Read Failed! Value: %d\nPacket Size: %d\nPacket Type: %s\n", result, header->mPacketSize, packetNames[header->mType]);
+                        this->socket_errno = nn::socket::GetLastErrno();
                         this->closeSocket();
                         return false;
                     }
@@ -154,6 +161,7 @@ bool SocketClient::RECV() {
         return true;
     } else {  // if we error'd, close the socket
         Logger::log("valread was zero! Disconnecting.\n");
+        this->socket_errno = nn::socket::GetLastErrno();
         this->closeSocket();
         return false;
     }