diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index 38848f70588..39d9c450fb5 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -277,7 +277,7 @@ public final class CardDb implements ICardDatabase {
 
         Collection<PaperCard> cards = allCardsByName.get(cardName);
         if ( null == cards ) {
-            throw new NoSuchElementException(String.format("Card '%s' not found in our database.", cardName));
+            return 0;
         } 
 
         for ( PaperCard pc : cards ) {
diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java
index ed25809dd60..517588bfa66 100644
--- a/forge-core/src/main/java/forge/deck/Deck.java
+++ b/forge-core/src/main/java/forge/deck/Deck.java
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
+import forge.StaticData;
 
 import forge.card.CardDb;
 import forge.card.ColorSet;
@@ -223,8 +224,16 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
         sb.append(n).append(" ").append(card.getName());
 
         if (!hasBadSetInfo) {
+            int artCount = StaticData.instance().getCommonCards().getArtCount(card.getName(), card.getEdition());
+            if (artCount < 1) {
+                artCount = StaticData.instance().getVariantCards().getArtCount(card.getName(), card.getEdition());
+            }
+
             sb.append("|").append(card.getEdition());
-            sb.append("|").append(card.getArtIndex());
+
+            if (artCount > 1) {
+                sb.append("|").append(card.getArtIndex());
+            }
         }
         if(card.isFoil()) {
             sb.append(CardDb.foilSuffix);