diff --git a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
index 24802e4ecc..5f8e3d28d2 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
@@ -66,7 +66,7 @@ public class AddLandDialog extends MageDialog {
         // decide from which sets basic lands are taken from
         for (String setCode :deck.getExpansionSetCodes()) {
             ExpansionInfo expansionInfo = ExpansionRepository.instance.getSetByCode(setCode);
-            if (expansionInfo.hasBasicLands()) {
+            if (expansionInfo != null && expansionInfo.hasBasicLands()) {
                 this.setCodesland.add(expansionInfo.getCode());
             }
         }