1 files changed, 3 insertions, 0 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterList.java b/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterList.java
index 2783675f..74bae6f0 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterList.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/adapter/AdapterList.java
@@ -66,6 +66,9 @@ public class AdapterList<T> implements Iterable<T> {
 
                         @Override
                         public Entry<T> next() {
+                                if (i >= size()) {
+                                        throw new NoSuchElementException();
+                                }
                                 var entry = new Entry<>(getType(i), get(i));
                                 i++;
                                 return entry;