diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
index e5dd9e717f..1ea3c5d514 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
@@ -368,17 +368,20 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 				shutdownProgram();
 				shutdownVao();
 				shutdownStretchedFbo();
+			}
 
+			if (jawtWindow != null)
+			{
 				if (!jawtWindow.getLock().isLocked())
 				{
 					jawtWindow.lockSurface();
 				}
 
-				glContext.destroy();
-			}
+				if (glContext != null)
+				{
+					glContext.destroy();
+				}
 
-			if (jawtWindow != null)
-			{
 				NewtFactoryAWT.destroyNativeWindow(jawtWindow);
 			}