From ffaffa39f8294a54881b30ae2bd4ccf6aff0184a Mon Sep 17 00:00:00 2001
From: emerald000 <emerald000@hotmail.com>
Date: Mon, 27 Apr 2015 16:52:10 -0400
Subject: [PATCH] Fixed NPE in the Tables panel.

---
 .../java/mage/client/table/TablesPanel.java   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 418fd2d632d..44eb319f89c 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -1199,15 +1199,17 @@ class TableTableModel extends AbstractTableModel {
         
         // set the column width from saved value or defaults        
         int[] widths = Util.getIntArrayFromString(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_COLUMNS_WIDTH, null));
-        int lengthW = widths.length;
-        int i = 0;
-        for (int width : defaultColumnsWidth) {
-            if (lengthW > i) {
-                width = widths[i];
-            }            
-            TableColumn column = table.getColumnModel().getColumn(i++);
-            column.setWidth(width);
-            column.setPreferredWidth(width);
+        if (widths != null) {
+            int lengthW = widths.length;
+            int i = 0;
+            for (int width : defaultColumnsWidth) {
+                if (lengthW > i) {
+                    width = widths[i];
+                }            
+                TableColumn column = table.getColumnModel().getColumn(i++);
+                column.setWidth(width);
+                column.setPreferredWidth(width);
+            }
         }
 
         // set the column order