diff --git a/src/main/java/de/bixilon/minosoft/data/world/container/SectionDataProvider.kt b/src/main/java/de/bixilon/minosoft/data/world/container/SectionDataProvider.kt
index 91d75c2fa..7568825fe 100644
--- a/src/main/java/de/bixilon/minosoft/data/world/container/SectionDataProvider.kt
+++ b/src/main/java/de/bixilon/minosoft/data/world/container/SectionDataProvider.kt
@@ -226,6 +226,9 @@ open class SectionDataProvider<T>(
 
     @Suppress("UNCHECKED_CAST")
     override fun iterator(): Iterator<T> {
-        return (data?.iterator() ?: EmptyIterator) as Iterator<T>
+        val data = this.data ?: return EmptyIterator.unsafeCast()
+        if (this.isEmpty) return EmptyIterator.unsafeCast()
+
+        return data.iterator().unsafeCast()
     }
 }