diff --git a/src/mkroom.c b/src/mkroom.c
index a56afc59c..c7f6196e4 100644
--- a/src/mkroom.c
+++ b/src/mkroom.c
@@ -422,7 +422,7 @@ int mm_flags;
 
     while (cnt--) {
         mdat = morguemon();
-        if (enexto(&cc, mm->x, mm->y, mdat)
+        if (mdat && enexto(&cc, mm->x, mm->y, mdat)
             && (!revive_corpses
                 || !(otmp = sobj_at(CORPSE, cc.x, cc.y))
                 || !revive(otmp, FALSE)))
diff --git a/src/polyself.c b/src/polyself.c
index 80f1d6f06..4c9380b72 100644
--- a/src/polyself.c
+++ b/src/polyself.c
@@ -448,7 +448,7 @@ int psflags;
                             || mntmp == urole.femalenum)) {
                 const char *pm_name;
 
-                /* mkclass_ploy() can pick a !polyok()
+                /* mkclass_poly() can pick a !polyok()
                    candidate; if so, usually try again */
                 if (class) {
                     if (rn2(3) || --tryct > 0)