diff --git a/src/macro.c b/src/macro.c
index 46357ed2..175eeca5 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -252,7 +252,10 @@ macroexpand_list(pic_state *pic, pic_value list, struct pic_senv *senv)
 {
   pic_value v;
 
-  if (! pic_pair_p(list))
+  if (pic_nil_p(list))
+    return pic_nil_value();
+
+  if (pic_symbol_p(list))
     return macroexpand(pic, list, senv);
 
   v = macroexpand(pic, pic_car(pic, list), senv);