diff --git a/lib/socket.c b/lib/socket.c
index 0b7077f13..25bae9786 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -510,6 +510,8 @@ int sockaddr_parse_any(sockaddr_t *dst, const char *src) {
 }
 int sockaddr_parse_any_str(sockaddr_t *dst, const str *src) {
 	char buf[64];
+	if (!src || !src->s)
+		return -1;
 	if (src->len >= sizeof(buf))
 		return -1;
 	sprintf(buf, STR_FORMAT, STR_FMT(src));
diff --git a/utils/const_str_hash b/utils/const_str_hash
index 3800ae08a..1b797d8ac 100755
--- a/utils/const_str_hash
+++ b/utils/const_str_hash
@@ -70,6 +70,8 @@ print "#pragma GCC diagnostic pop\n";
 print <<END;
 #include "str.h"
 static int __csh_lookup(const str *s) {
+	if (!s->s)
+		return -1;
 	struct __csh_hash_lookup *h = __csh_lookup_raw(s->s, s->len);
 	if (!h)
 		return -1;