diff --git a/Mage.HumanPlayer/src/mage/human/HumanPlayer.java b/Mage.HumanPlayer/src/mage/human/HumanPlayer.java
index 006a08716a..77be226d7c 100644
--- a/Mage.HumanPlayer/src/mage/human/HumanPlayer.java
+++ b/Mage.HumanPlayer/src/mage/human/HumanPlayer.java
@@ -343,9 +343,11 @@ public class HumanPlayer extends PlayerImpl {
 		}
 		else {
 			game.fireGetChoiceEvent(playerId, name, abilities.values());
-			waitForUUIDResponse();
-			if (abilities.containsKey(response.getUUID()))
-				activateAbility(abilities.get(response.getUUID()), game);
+			waitForResponse();
+			if (response.getUUID() != null) {
+				if (abilities.containsKey(response.getUUID()))
+					activateAbility(abilities.get(response.getUUID()), game);
+			}
 		}
 	}