diff --git a/Core/Core.cpp b/Core/Core.cpp
index 87d3d40fd7..100722e573 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -60,6 +60,7 @@ static bool powerSaving = false;
 
 void Core_SetGraphicsContext(GraphicsContext *ctx) {
 	graphicsContext = ctx;
+	PSP_CoreParameter().graphicsContext = graphicsContext;
 }
 
 void Core_NotifyWindowHidden(bool hidden) {
diff --git a/GPU/GPU.cpp b/GPU/GPU.cpp
index 39a6998bf9..cc91b1e512 100644
--- a/GPU/GPU.cpp
+++ b/GPU/GPU.cpp
@@ -66,6 +66,10 @@ bool GPU_Init(GraphicsContext *ctx, Thin3DContext *thin3d) {
 		return false;
 	case GPUCORE_VULKAN:
 #ifndef NO_VULKAN
+		if (!ctx) {
+			ERROR_LOG(G3D, "Unable to init Vulkan GPU backend, no context");
+			break;
+		}
 		SetGPU(new GPU_Vulkan(ctx));
 #endif
 		break;
diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
index 7b8969682b..5297c3e02d 100644
--- a/GPU/Vulkan/GPU_Vulkan.cpp
+++ b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -401,7 +401,7 @@ GPU_Vulkan::GPU_Vulkan(GraphicsContext *ctx)
 
 	shaderManager_ = new ShaderManagerVulkan(vulkan_);
 	pipelineManager_ = new PipelineManagerVulkan(vulkan_);
-	framebufferManager_ = new FramebufferManagerVulkan(vulkan_),
+	framebufferManager_ = new FramebufferManagerVulkan(vulkan_);
 	drawEngine_.SetTextureCache(&textureCache_);
 	drawEngine_.SetFramebufferManager(framebufferManager_);
 	drawEngine_.SetShaderManager(shaderManager_);
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 33ce542869..f9d1ffa301 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -165,8 +165,6 @@ unsigned int WINAPI TheThread(void *)
 		ExitProcess(1);
 	}
 
-	PSP_CoreParameter().graphicsContext = graphicsContext;
-
 	NativeInitGraphics(graphicsContext);
 	NativeResized();