1 files changed, 4 insertions, 2 deletions
diff --git a/ell.c b/ell.c
index e277d3f..c73ba9e 100755
--- a/ell.c
+++ b/ell.c
@@ -908,8 +908,10 @@ defn (fn_set) {
 	if ((value = name->next))
 		return set (ctx, name->value, value);
 
-	// FIXME: how do we represent a nil value here?
-	return check (ctx, (*result = new_clone (get (ctx, name->value))));
+	// We return an empty list for a nil value
+	if (!(value = get (ctx, name->value)))
+		return check (ctx, (*result = new_list (NULL)));
+	return check (ctx, (*result = new_clone (value)));
 }
 
 defn (fn_list) {