diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java
index a0f0fa0b555..3968827159e 100644
--- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java
+++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java
@@ -28,6 +28,7 @@
 package mage.sets.worldwake;
 
 import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.Constants.Zone;
@@ -120,11 +121,14 @@ class QuestForTheNihilStoneTriggeredAbility2 extends TriggeredAbilityImpl<QuestF
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         Permanent quest = game.getPermanent(super.getSourceId());
+        if (quest == null) {
+            Permanent questLKI = (Permanent) game.getLastKnownInformation(super.getSourceId(), Constants.Zone.BATTLEFIELD);
+            quest = questLKI;
+        }
         if (event.getType() == GameEvent.EventType.UPKEEP_STEP_PRE && game.getOpponents(controllerId).contains(event.getPlayerId())) {
             Player opponent = game.getPlayer(event.getPlayerId());
             if (opponent != null
                     && opponent.getHand().size() == 0
-                    && quest != null
                     && quest.getCounters().getCount(CounterType.QUEST) >= 2) {
                 for (Effect effect : this.getEffects()) {
                     effect.setTargetPointer(new FixedTarget(opponent.getId()));
@@ -135,8 +139,8 @@ class QuestForTheNihilStoneTriggeredAbility2 extends TriggeredAbilityImpl<QuestF
         return false;
     }
 
-        @Override
-        public String getRule() {
+    @Override
+    public String getRule() {
         return "At the beginning of each opponent's upkeep, if that player has no cards in hand and {this} has two or more quest counters on it, you may have that player lose 5 life.";
-        }
     }
+}
diff --git a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java
index eb33e7721fe..79b2d832cb0 100644
--- a/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java
+++ b/Mage.Sets/src/mage/sets/worldwake/ScribNibblers.java
@@ -60,7 +60,9 @@ public class ScribNibblers extends CardImpl<ScribNibblers> {
         this.toughness = new MageInt(1);
 
         // {tap}: Exile the top card of target player's library. If it's a land card, you gain 1 life.
-        this.addAbility(new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ScribNibblersEffect(), new TapSourceCost()));
+        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ScribNibblersEffect(), new TapSourceCost());
+        ability.addTarget(new TargetPlayer());
+        this.addAbility(ability);
 
         // Landfall - Whenever a land enters the battlefield under your control, you may untap Scrib Nibblers.
         this.addAbility(new LandfallAbility(Constants.Zone.BATTLEFIELD, new UntapSourceEffect(), true));
@@ -95,17 +97,13 @@ class ScribNibblersEffect extends OneShotEffect<ScribNibblersEffect> {
     @Override
     public boolean apply(Game game, Ability source) {
         Player you = game.getPlayer(source.getControllerId());
-        TargetPlayer target = new TargetPlayer();
-        target.setRequired(true);
-        if (you.choose(Constants.Outcome.Neutral, target, source.getId(), game)) {
-            Player targetPlayer = game.getPlayer(target.getFirstTarget());
-            if (targetPlayer != null && targetPlayer.getLibrary().size() > 0) {
-                Card card = targetPlayer.getLibrary().getFromTop(game);
-                card.moveToExile(id, "Scrib Nibblers Exile", source.getId(), game);
-                if (card != null && card.getCardType().contains(CardType.LAND)) {
-                    you.gainLife(1, game);
-                    return true;
-                }
+        Player targetPlayer = game.getPlayer(source.getFirstTarget());
+        if (targetPlayer != null && targetPlayer.getLibrary().size() > 0) {
+            Card card = targetPlayer.getLibrary().getFromTop(game);
+            card.moveToExile(id, "Scrib Nibblers Exile", source.getId(), game);
+            if (card != null && card.getCardType().contains(CardType.LAND)) {
+                you.gainLife(1, game);
+                return true;
             }
         }
         return false;