diff --git a/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java b/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java
index 45b20aaeba..d6f2867456 100644
--- a/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java
+++ b/Mage.Sets/src/mage/cards/z/ZaffaiThunderConductor.java
@@ -70,19 +70,25 @@ class ZaffaiThunderConductorEffect extends OneShotEffect {
         if (player == null) {
             return false;
         }
+
         player.scry(1, source, game);
         Spell spell = (Spell) getValue(MagecraftAbility.SPELL_KEY);
         if (spell == null || spell.getManaValue() < 5) {
-            return false;
+            return true;
         }
+
         new Elemental44Token().putOntoBattlefield(1, game, source, source.getControllerId());
         if (spell.getManaValue() < 10) {
             return true;
         }
+
         TargetOpponent target = new TargetOpponent(true);
-        player.chooseTarget(outcome, target, source, game);
+        target.setRandom(true);
+        target.chooseTarget(Outcome.Damage, player.getId(), source, game);
         Player opponent = game.getPlayer(target.getFirstTarget());
-        opponent.damage(10, source.getSourceId(), source, game);
+        if (opponent != null) {
+            opponent.damage(10, source.getSourceId(), source, game);
+        }
         return true;
     }
 }