diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 24b8765faf..7d0c151130 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -281,6 +281,8 @@ static inline char *switch_strchr_strict(const char *in, char find, const char *
 
 	p = in;
 
+	if (!*p) return NULL;
+
 	while(p && *p) {
 		const char *a = allowed;
 		int acceptable = 0;