diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
index 7bdad3b5f..79fdaa2de 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
@@ -160,6 +160,10 @@ public class Heap implements Bundlable {
 	
 	public Item pickUp() {
 		
+		if (items.isEmpty()){
+			destroy();
+			return null;
+		}
 		Item item = items.removeFirst();
 		if (items.isEmpty()) {
 			destroy();