diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 1a2e69cff236c785c2270d8805fd883221b50638..4b674210548d60376e1a05bc118f125d4d35e6bc 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -1015,6 +1015,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
     }
 
     public int addAvatarDesignPanel(String name, int index) {
+        if (tabs == null) {
+            return -1;
+        }
         if (index == -1) {
             index = tabs.size();
         }
@@ -1626,7 +1629,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
 
     public int createAvatarDesign(String name) {
         int index = addAvatarDesignPanel(name, -1);
-        mainTabbedPane.setSelectedIndex(index);
+        if (index > -1) {
+            mainTabbedPane.setSelectedIndex(index);
+        }
         return index;
     }
 
@@ -1912,6 +1917,9 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         TraceManager.addDev("Draw Spec 1");
         int index = createAvatarDesign(tabName);
         TraceManager.addDev("Draw Spec 2, in tab index=" + index);
+        if (index == 1) {
+            return;
+        }
         AvatarDesignPanel adp = (AvatarDesignPanel) (tabs.elementAt(index));
         TraceManager.addDev("Draw Spec 3");
         adp.abdp.drawable = false;