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 5f8e3d28d2..e8844de45b 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/AddLandDialog.java
@@ -75,10 +75,12 @@ public class AddLandDialog extends MageDialog {
         if (this.setCodesland.isEmpty()) {
             for (String setCode :deck.getExpansionSetCodes()) {
                 ExpansionInfo expansionInfo = ExpansionRepository.instance.getSetByCode(setCode);
-                ExpansionInfo [] blockSets = ExpansionRepository.instance.getSetsFromBlock(expansionInfo.getBlockName());
-                for (ExpansionInfo blockSet: blockSets) {
-                    if (blockSet.hasBasicLands()) {
-                        this.setCodesland.add(blockSet.getCode());
+                if (expansionInfo != null) {
+                    ExpansionInfo [] blockSets = ExpansionRepository.instance.getSetsFromBlock(expansionInfo.getBlockName());
+                    for (ExpansionInfo blockSet: blockSets) {
+                        if (blockSet.hasBasicLands()) {
+                            this.setCodesland.add(blockSet.getCode());
+                        }
                     }
                 }
             }