Index: /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java	(revision 5301)
+++ /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java	(revision 5302)
@@ -36,5 +36,5 @@
  */
 class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
-    protected JCheckBox[] checkBoxes = new JCheckBox[2];
+    protected final JCheckBox[] checkBoxes = new JCheckBox[2];
     private CopyOnWriteArrayList<CellEditorListener> listeners;
 
@@ -49,7 +49,7 @@
         listeners = new CopyOnWriteArrayList<CellEditorListener>();
 
-        setLayout(new GridBagLayout());
         checkBoxes[0] = new JCheckBox(tr("Upload"));
         checkBoxes[1] = new JCheckBox(tr("Save"));
+        setLayout(new GridBagLayout());
 
         ActionMap am = getActionMap();
@@ -71,14 +71,16 @@
 
     protected void updateCheckboxes(Object v) {
-        boolean[] values;
-        if(v instanceof SaveLayerInfo) {
-            values = new boolean[2];
-            values[0] = ((SaveLayerInfo) v).isDoUploadToServer();
-            values[1] = ((SaveLayerInfo) v).isDoSaveToFile();
-        } else {
-            values = (boolean[]) v;
+        if (checkBoxes[0] != null && checkBoxes[1] != null) {
+            boolean[] values;
+            if(v instanceof SaveLayerInfo) {
+                values = new boolean[2];
+                values[0] = ((SaveLayerInfo) v).isDoUploadToServer();
+                values[1] = ((SaveLayerInfo) v).isDoSaveToFile();
+            } else {
+                values = (boolean[]) v;
+            }
+            checkBoxes[0].setSelected(values[0]);
+            checkBoxes[1].setSelected(values[1]);
         }
-        checkBoxes[0].setSelected(values[0]);
-        checkBoxes[1].setSelected(values[1]);
     }