diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
index 7e639db21..48798644b 100644
--- a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
+++ b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs
@@ -342,7 +342,8 @@ namespace MatterHackers.GCodeVisualizer
 				for (int i = renderInfo.EndLayerIndex - 1; i >= renderInfo.StartLayerIndex; i--)
 				{
 					// If its the first render or we change what we are trying to render then create vertex data.
-					if (layerVertexBuffer[i] == null)
+					if (layerVertexBuffer.Count > i
+						&&  layerVertexBuffer[i] == null)
 					{
 						layerVertexBuffer[i] = Create3DDataForLayer(i, renderInfo);
 					}
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index cebbbccd8..6e36de975 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit cebbbccd825b282a1a322271246a4603810c4e31
+Subproject commit 6e36de975620da1f06daefbd082cccecb8a927d6