diff --git a/src/forge/TableModel.java b/src/forge/TableModel.java
index e70e3a68b9d..110f780fd75 100644
--- a/src/forge/TableModel.java
+++ b/src/forge/TableModel.java
@@ -211,11 +211,13 @@ class TableModel extends AbstractTableModel {
             	return "";
             case 6:
                 String rarity = c.getRarity();
-                //if(rarity.length() > 0) rarity = rarity.substring(0, 1);
+
                 if (rarity.equals("new"))
                 	return "n";
-                else
-                	rarity = rarity.substring(0,1);
+                else {
+                	if (rarity.length() > 0) 
+                		rarity = rarity.substring(0, 1);
+                }
                 
                 if (!c.getCurSetCode().equals("")){
                 	SetInfo si = SetInfoUtil.getSetInfo_Code(c.getSets(), c.getCurSetCode());