diff --git a/src/pickup.c b/src/pickup.c
index c52538f02..9c95dd062 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -2014,6 +2014,10 @@ register int held;
 		    char menuprompt[QBUFSZ];
 		    boolean outokay = (cnt != 0);
 		    boolean inokay = (invent != 0);
+		    if (!outokay && !inokay) {
+			pline("%s You don't have anything to put in.", emptymsg);
+			return used;
+		    }
 		    menuprompt[0] = '\0';
 		    if (!cnt) Sprintf(menuprompt, "%s ", emptymsg);
 		    Strcat(menuprompt, "Do what?");