diff --git a/src/eat.c b/src/eat.c
index 085e85e3d..d6169aaef 100644
--- a/src/eat.c
+++ b/src/eat.c
@@ -471,7 +471,7 @@ int *dmg_p;	/* for dishing out extra damage in lieu of Int loss */
     if (noncorporeal(pd)) {
 	if (visflag)
 	    pline("%s brain is unharmed.",
-		  (mdef == &youmonst) ? "Your" : s_suffix(mon_nam(mdef)));
+		  (mdef == &youmonst) ? "Your" : s_suffix(Monnam(mdef)));
 	return MM_MISS;	/* side-effects can't occur */
     } else if (magr == &youmonst) {
 	You("eat %s brain!", s_suffix(mon_nam(mdef)));
@@ -555,6 +555,9 @@ int *dmg_p;	/* for dishing out extra damage in lieu of Int loss */
 		done(DIED);
 		/* amulet of life saving has now been used up */
 		pline("Unfortunately your brain is still gone.");
+		/* sanity check against adding other forms of life-saving */
+		u.uprops[LIFESAVED].extrinsic =
+			u.uprops[LIFESAVED].intrinsic = 0L;
 	    } else {
 		Your("last thought fades away.");
 	    }
diff --git a/src/end.c b/src/end.c
index f85a36d5f..123a45338 100644
--- a/src/end.c
+++ b/src/end.c
@@ -422,8 +422,11 @@ STATIC_OVL void
 savelife(how)
 int how;
 {
-	u.uswldtim = 0;
+	int uhpmin = max(2 * u.ulevel, 10);
+
+	if (u.uhpmax < uhpmin) u.uhpmax = uhpmin;
 	u.uhp = u.uhpmax;
+	u.uswldtim = 0;
 	if (u.uhunger < 500) {
 	    u.uhunger = 500;
 	    newuhs(FALSE);
@@ -611,7 +614,6 @@ int how;
 		if (uamul) useup(uamul);
 
 		(void) adjattrib(A_CON, -1, TRUE);
-		if(u.uhpmax <= 0) u.uhpmax = 10;	/* arbitrary */
 		savelife(how);
 		if (how == GENOCIDED)
 			pline("Unfortunately you are still genocided...");
@@ -629,7 +631,6 @@ int how;
 		if(yn("Die?") == 'y') goto die;
 		pline("OK, so you don't %s.",
 			(how == CHOKING) ? "choke" : "die");
-		if(u.uhpmax <= 0) u.uhpmax = u.ulevel * 8;	/* arbitrary */
 		savelife(how);
 		killer.name[0] = 0;
 		killer.format = 0;