diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
index dffc52fa9..7e639db21 100644
--- a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
+++ b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
@@ -185,13 +185,19 @@ namespace MatterHackers.GCodeVisualizer
 			{
 				try
 				{
-					return renderFeatures[layerIndex][featureIndex];
+					var layer = renderFeatures[layerIndex];
+
+					if (featureIndex < layer.Count)
+					{
+						return layer[featureIndex];
+					}
 				}
 				catch
 				{
-					// Lazy guard for invalid indexes - callers should test for non-null values
-					return null;
 				}
+
+				// Callers should test for non-null values
+				return null;
 			}
 		}