diff --git a/MinecraftClient/Mapping/ChunkColumn.cs b/MinecraftClient/Mapping/ChunkColumn.cs
index 26cbab39..007bdb22 100644
--- a/MinecraftClient/Mapping/ChunkColumn.cs
+++ b/MinecraftClient/Mapping/ChunkColumn.cs
@@ -42,7 +42,14 @@ namespace MinecraftClient.Mapping
         /// <returns>The chunk, or null if not loaded</returns>
         public Chunk GetChunk(Location location)
         {
-            return this[location.ChunkY];
+            try
+            {
+                return this[location.ChunkY];
+            }
+            catch (IndexOutOfRangeException)
+            {
+                return null;
+            }
         }
     }
 }