diff --git a/edify/expr.c b/edify/expr.c
index 7a5b2fb..3600075 100644
--- a/edify/expr.c
+++ b/edify/expr.c
@@ -50,6 +50,7 @@ Value* EvaluateValue(State* state, Expr* expr) {
 }
 
 Value* StringValue(char* str) {
+    if (str == NULL) return NULL;
     Value* v = malloc(sizeof(Value));
     v->type = VAL_STRING;
     v->size = strlen(str);