diff --git a/Mage.Client/plugins/mage-card-plugin.jar b/Mage.Client/plugins/mage-card-plugin.jar
index 269545512b0..b595fc1386e 100644
Binary files a/Mage.Client/plugins/mage-card-plugin.jar and b/Mage.Client/plugins/mage-card-plugin.jar differ
diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index 7828702ce14..f8b2e21b25c 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -227,6 +227,8 @@ public class TablesPanel extends javax.swing.JPanel implements Observer {
                 btnNewDraftActionPerformed(evt);
             }
         });
+		//FIXME: removed on released 0.6 version
+		btnNewDraft.setVisible(false);
 
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
diff --git a/Mage.Common/src/mage/utils/DeckBuilder.java b/Mage.Common/src/mage/utils/DeckBuilder.java
index 922fc797542..a6f61004290 100644
--- a/Mage.Common/src/mage/utils/DeckBuilder.java
+++ b/Mage.Common/src/mage/utils/DeckBuilder.java
@@ -249,6 +249,7 @@ public class DeckBuilder {
 					maxSingleCount = Math.max(maxSingleCount, typeCount);
 				}
 			}
+			maxSingleCount = Math.min(maxSingleCount, SINGLE_PENALTY.length - 1);
 			return 2 * converted + 3 * (10 - SINGLE_PENALTY[maxSingleCount]/*-DOUBLE_PENALTY[doubleCount]*/);
 		}
 
diff --git a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java
index 444a1c73052..4d6c4c5c025 100644
--- a/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java
+++ b/Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java
@@ -33,15 +33,15 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane {
     }
 
     public void setCard(final CardView card) {
-        if (card == null) return;
+	    if (card == null) return;
         if (isCurrentCard(card)) return;
-        currentCard = card;
+	    currentCard = card;
 
         ThreadUtils.threadPool.submit(new Runnable() {
             public void run() {
-                if (!card.equals(currentCard)) return;
+            	if (!card.equals(currentCard)) return;
 
-                String manaCost = "";
+			    String manaCost = "";
                 for (String m : card.getManaCost()) {
                     manaCost += m;
                 }
@@ -55,24 +55,29 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane {
 
                 List<String> rules = card.getRules();
 				List<String> rulings = new ArrayList<String>(rules);
-				if (card instanceof PermanentView) {
-					int count = ((PermanentView)card).getCounters().size();
-					if (count > 0) {
-						StringBuilder sb = new StringBuilder();
-						int index = 0;
-						for (CounterView counter: ((PermanentView)card).getCounters()) {
-							if (counter.getCount() > 0) {
-								if (index == 0) {
-									sb.append("<b>Counters:</b> ");
-								} else {
-									sb.append(", ");
+				try {
+					if (card instanceof PermanentView) {
+						List<CounterView> counters = ((PermanentView)card).getCounters();
+						int count = counters != null ? counters.size() : 0;
+						if (count > 0) {
+							StringBuilder sb = new StringBuilder();
+							int index = 0;
+							for (CounterView counter: ((PermanentView)card).getCounters()) {
+								if (counter.getCount() > 0) {
+									if (index == 0) {
+										sb.append("<b>Counters:</b> ");
+									} else {
+										sb.append(", ");
+									}
+									sb.append(counter.getCount() + "x<i>" + counter.getName() + "</i>");
+									index++;
 								}
-								sb.append(counter.getCount() + "x<i>" + counter.getName() + "</i>");
-								index++;
 							}
+							rulings.add(sb.toString());
 						}
-						rulings.add(sb.toString());
 					}
+				} catch (Exception e) {
+					e.printStackTrace();
 				}
 
                 boolean smallImages = true;