diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/Chunk.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/Chunk.kt
index 711b4a4ea..1e5ab48dd 100644
--- a/src/main/java/de/bixilon/minosoft/data/world/chunk/Chunk.kt
+++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/Chunk.kt
@@ -533,7 +533,7 @@ class Chunk(
             if (x < ProtocolDefinition.SECTION_MAX_X) {
                 skylightHeightmap[heightmapIndex + 1]
             } else {
-                neighbours[ChunkNeighbours.WEST].skylightHeightmap[((z shl 4) or 0)]
+                neighbours[ChunkNeighbours.WEST].skylightHeightmap[(z shl 4) or 0]
             },
 
             if (z > 0) {
@@ -569,7 +569,7 @@ class Chunk(
         }
     }
 
-    fun getMaxHeight(x: Int, z: Int): Int {
+    inline fun getMaxHeight(x: Int, z: Int): Int {
         return skylightHeightmap[(z shl 4) or x]
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt
index d353c6114..dc30866e6 100644
--- a/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt
+++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt
@@ -264,11 +264,14 @@ class SectionLight(
             return
         }
 
-        val lightProperties = section.blocks.unsafeGet(index)?.lightProperties ?: TransparentProperty
+        var lightProperties = section.blocks.unsafeGet(index)?.lightProperties
 
-        if (!lightProperties.propagatesLight) {
+        if (lightProperties == null) {
+            lightProperties = TransparentProperty
+        } else if (!lightProperties.propagatesLight) {
             return
         }
+
         this.light[index] = ((currentLight and BLOCK_LIGHT_MASK) or (nextLevel shl 4)).toByte()
 
         val neighbours = this.section.neighbours ?: return