diff --git a/src/hb-language.c b/src/hb-language.c
index 2aabada8fb5ba1d61fd8cf1b00120f64fc8cbed0..7c2295ac93523fe6fca70ffaebeeec2831fe3c33 100644
--- a/src/hb-language.c
+++ b/src/hb-language.c
@@ -85,7 +85,7 @@ hb_language_from_string (const char *str)
 
   /* TODO Use a hash table or something */
 
-  if (!str)
+  if (!str || !*str)
     return NULL;
 
   for (i = 0; i < num_langs; i++)