diff --git a/py/qstr.c b/py/qstr.c
index 0ae0835..dc89013 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -233,6 +233,11 @@
 }
 
 qstr qstr_find_strn(const char *str, size_t str_len) {
+    if (str_len == 0) {
+        // strncmp behaviour is undefined for str==NULL.
+        return MP_QSTR_;
+    }
+
     // work out hash of str
     size_t str_hash = qstr_compute_hash((const byte *)str, str_len);