diff --git a/src/com/gpl/rpg/atcontentstudio/ui/tools/CommonEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/tools/CommonEditor.java
index 37e9059..c79725b 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/tools/CommonEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/tools/CommonEditor.java
@@ -213,7 +213,7 @@ public final class CommonEditor {
 
         @Override
         public E getElementAt(int index) {
-            if (getInner() == null) return null;
+            if (index < 0 || index >= getSize()) return null;
             return getInner().get(index);
         }