diff --git a/src/main/java/forge/error/BugReporter.java b/src/main/java/forge/error/BugReporter.java
index 706fd326373..fa62547db44 100644
--- a/src/main/java/forge/error/BugReporter.java
+++ b/src/main/java/forge/error/BugReporter.java
@@ -90,7 +90,7 @@ public class BugReporter {
         
         _buildSpoilerFooter(sb);
 
-        _showDialog("Report a crash", sb.toString(), false);
+        _showDialog("Report a crash", sb.toString(), true);
     }
 
     /**
@@ -222,7 +222,7 @@ public class BugReporter {
         JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE,
                 JOptionPane.DEFAULT_OPTION, null, options.toArray(), options.get(0));
         JDialog dlg = pane.createDialog(null, title);
-        dlg.setSize(600, 500);
+        dlg.setSize(780, 500);
         dlg.setResizable(true);
         dlg.setLocationRelativeTo(null);
         dlg.setVisible(true);
diff --git a/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java b/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java
index 29792bc5974..0cb4443a547 100644
--- a/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java
+++ b/src/main/java/forge/gui/deckeditor/tables/EditorTableModel.java
@@ -191,14 +191,16 @@ public final class EditorTableModel<T extends InventoryItem> extends AbstractTab
     public void showSelectedCard(final JTable table) {
         final int row = table.getSelectedRow();
         if (row != -1) {
-            final T cp = this.rowToCard(row).getKey();
-            if (cp instanceof CardPrinted) {
-                CDeckEditorUI.SINGLETON_INSTANCE.setCard(((CardPrinted) cp).getMatchingForgeCard());
-            }
-            else if (cp != null) {
-                CDeckEditorUI.SINGLETON_INSTANCE.setCard(cp);
-            }
-            else {
+            Entry<T, Integer> card = this.rowToCard(row);
+            if (null != card) {
+                T cp = card.getKey();
+                if (cp instanceof CardPrinted) {
+                    CDeckEditorUI.SINGLETON_INSTANCE.setCard(((CardPrinted) cp).getMatchingForgeCard());
+                }
+                else {
+                    CDeckEditorUI.SINGLETON_INSTANCE.setCard(cp);
+                }
+            } else {
                 CDeckEditorUI.SINGLETON_INSTANCE.setCard((Card)null);
             }
         }