diff --git a/src/main/java/carpet/script/value/ListValue.java b/src/main/java/carpet/script/value/ListValue.java
index 2b0abd56..e0ab33f4 100644
--- a/src/main/java/carpet/script/value/ListValue.java
+++ b/src/main/java/carpet/script/value/ListValue.java
@@ -437,15 +437,9 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
     public Value get(Value value)
     {
         long index = NumericValue.asNumber(value, "'address' to a list index").getLong();
-        try
-        {
-            return items.get(normalizeIndex(index, items.size()));
-        }
-        catch (ArithmeticException are)
-        {
-            if (items.isEmpty()) return Value.NULL;
-            throw are;
-        }
+        int size = items.size();
+        if (size == 0) return Value.NULL;
+        return items.get(normalizeIndex(index, size));
     }
 
     @Override