diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Surprise.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Surprise.java
index 31f284022..086aab615 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Surprise.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Surprise.java
@@ -76,7 +76,7 @@ public class Surprise extends Image {
 	}
 
 	public static void hit(Char ch, float angle) {
-		if (ch.sprite.parent != null) {
+		if (ch.sprite != null && ch.sprite.parent != null) {
 			Surprise s = (Surprise) ch.sprite.parent.recycle(Surprise.class);
 			ch.sprite.parent.bringToFront(s);
 			s.reset(ch.sprite);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java
index f99589dca..a54788bb6 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java
@@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Point;
-import com.watabou.utils.Random;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -76,7 +75,8 @@ public class StoneOfDisarming extends Runestone {
 				curr++;
 			}
 		}
-		
+
+		Collections.shuffle(disarmCandidates);
 		Collections.sort(disarmCandidates, new Comparator<Trap>() {
 			@Override
 			public int compare(Trap o1, Trap o2) {
@@ -84,7 +84,7 @@ public class StoneOfDisarming extends Runestone {
 				if (diff < 0){
 					return -1;
 				} else if (diff == 0){
-					return Random.Int(2) == 0 ? -1 : 1;
+					return 0;
 				} else {
 					return 1;
 				}