diff --git a/src/main/java/com/glaurung/batMap/gui/RoomColors.java b/src/main/java/com/glaurung/batMap/gui/RoomColors.java
index 8551772..024b1bc 100644
--- a/src/main/java/com/glaurung/batMap/gui/RoomColors.java
+++ b/src/main/java/com/glaurung/batMap/gui/RoomColors.java
@@ -55,7 +55,7 @@ public static int getIndex( Color color ) {
         } else if (color.equals( IVORY )) {
             return 9;
         } else {
-            return 1000;
+            return 0; // Unsupported color, default to 0 (instead of previously value 1000 which caused out of bounds exception in rare occasions). 
         }
 
     }
diff --git a/src/main/java/com/glaurung/batMap/gui/search/SearchPanel.java b/src/main/java/com/glaurung/batMap/gui/search/SearchPanel.java
index 0b146ef..760e065 100644
--- a/src/main/java/com/glaurung/batMap/gui/search/SearchPanel.java
+++ b/src/main/java/com/glaurung/batMap/gui/search/SearchPanel.java
@@ -6,6 +6,7 @@
 import java.awt.event.ItemListener;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -124,6 +125,7 @@ private void populateAreaList() {
         listAllModel.removeAllElements();
         listAllModel.addElement( new AreaListItem( new Room( "Area", "first slot placeholder", new Area( "Areas list" ) ) ) );
         List<String> areas = AreaDataPersister.listAreaNames( this.engine.getBaseDir() );
+        Collections.sort( areas, String.CASE_INSENSITIVE_ORDER );
         try {
             for (String areaName : areas) {
                 AreaSaveObject aso = AreaDataPersister.loadData( this.engine.getBaseDir(), areaName );