diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java b/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java
index b0fae2cfb1..2e2d092b31 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/HumblerOfMortals.java
@@ -54,7 +54,7 @@ public class HumblerOfMortals extends CardImpl<HumblerOfMortals> {
         this.toughness = new MageInt(5);
 
         // Constellation - Whenever Humbler of Mortals or another enchantment enters the battlefield under your control, creatures you control gain trample until end of turn.
-        this.addAbility(new ConstellationAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent())));
+        this.addAbility(new ConstellationAbility(new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures"))));
     }
 
     public HumblerOfMortals(final HumblerOfMortals card) {
diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/mage/cards/ExpansionSet.java
index 7ac4809d8e..9fc9ec44fc 100644
--- a/Mage/src/mage/cards/ExpansionSet.java
+++ b/Mage/src/mage/cards/ExpansionSet.java
@@ -28,17 +28,16 @@
 
 package mage.cards;
 
-import mage.constants.Rarity;
-import mage.constants.SetType;
-import mage.cards.repository.CardCriteria;
-import mage.cards.repository.CardInfo;
-import mage.cards.repository.CardRepository;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
+import mage.cards.repository.CardCriteria;
+import mage.cards.repository.CardInfo;
+import mage.cards.repository.CardRepository;
+import mage.constants.Rarity;
+import mage.constants.SetType;
 
 /**
  * @author BetaSteward_at_googlemail.com
@@ -113,13 +112,9 @@ public abstract class ExpansionSet implements Serializable {
             return booster;
         }
 
-        CardCriteria criteria = new CardCriteria();
-        criteria.setCodes(!hasBasicLands && parentSet != null ? parentSet.code : this.code).rarities(Rarity.LAND).doubleFaced(false);
-        List<CardInfo> basicLand = CardRepository.instance.findCards(criteria);
-
         List<CardInfo> common = getCommon();
 
-        criteria = new CardCriteria();
+        CardCriteria criteria = new CardCriteria();
         criteria.setCodes(this.code).rarities(Rarity.UNCOMMON).doubleFaced(false);
         List<CardInfo> uncommon = CardRepository.instance.findCards(criteria);
 
@@ -131,9 +126,15 @@ public abstract class ExpansionSet implements Serializable {
         criteria.setCodes(this.code).rarities(Rarity.MYTHIC).doubleFaced(false);
         List<CardInfo> mythic = CardRepository.instance.findCards(criteria);
      
-        for (int i = 0; i < numBoosterLands; i++) {
-            addToBooster(booster, basicLand);
+        if (numBoosterLands > 0) {
+            criteria = new CardCriteria();
+            criteria.setCodes(!hasBasicLands && parentSet != null ? parentSet.code : this.code).rarities(Rarity.LAND).doubleFaced(false);
+            List<CardInfo> basicLand = CardRepository.instance.findCards(criteria);
+            for (int i = 0; i < numBoosterLands; i++) {
+                addToBooster(booster, basicLand);
+            }
         }
+
         for (int i = 0; i < numBoosterCommon; i++) {
             addToBooster(booster, common);
         }