diff --git a/qse/lib/si/SocketAddress.cpp b/qse/lib/si/SocketAddress.cpp
index acb42df4..e0466652 100644
--- a/qse/lib/si/SocketAddress.cpp
+++ b/qse/lib/si/SocketAddress.cpp
@@ -525,7 +525,7 @@ qse_mchar_t* SocketAddress::toStrBuf (qse_mchar_t* buf, qse_size_t len) const QS
 {
 	qse_nwad_t nwad;
 	qse_skadtonwad (&this->skad, &nwad);
-	qse_nwadtombs (&nwad, buf, len, QSE_NWADTOWCS_ALL);
+	qse_nwadtombs (&nwad, buf, len, QSE_NWADTOMBS_ALL);
 	return buf;
 }
 
diff --git a/qse/lib/si/nwad-skad.c b/qse/lib/si/nwad-skad.c
index d505dfb8..47bab142 100644
--- a/qse/lib/si/nwad-skad.c
+++ b/qse/lib/si/nwad-skad.c
@@ -164,6 +164,8 @@ static QSE_INLINE int skad_to_nwad (const sockaddr_t* skad, qse_nwad_t* nwad)
 		}
 	#endif
 		default:
+			QSE_MEMSET (nwad, 0, QSE_SIZEOF(*nwad));
+			nwad->type = QSE_NWAD_NX;
 			break;
 	}
 
@@ -237,6 +239,14 @@ static QSE_INLINE int nwad_to_skad (const qse_nwad_t* nwad, sockaddr_t* skad)
 			break;
 		}
 
+		default:
+		{
+			struct sockaddr* sa;
+			sa = (struct sockaddr*)skad;
+			QSE_MEMSET (sa, 0, QSE_SIZEOF(*sa));
+			sa->sa_family = AF_UNSPEC;
+			break;
+		}
 	}
 
 	return addrsize;