diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java
index e66f1c7..e529af1 100644
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -104,7 +104,7 @@ class KeyboardData
 
   private static void addExtraKeys_to_row(ArrayList<Row> rows, final Iterator<KeyValue> extra_keys, int row_i, final int d)
   {
-    if (!extra_keys.hasNext())
+    if (!extra_keys.hasNext() || row_i >= rows.size())
       return;
     rows.set(row_i, rows.get(row_i).mapKeys(new MapKey(){
       public Key apply(Key k) {