diff --git a/dpf b/dpf
index 56a65f5..0f31c24 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 56a65f56a369e5b031aac5bbfb5999e974e32fad
+Subproject commit 0f31c24917043d6841fcc16efcb0e4e85bc51a89
diff --git a/src/override/Window.cpp b/src/override/Window.cpp
index 284d745..265026c 100644
--- a/src/override/Window.cpp
+++ b/src/override/Window.cpp
@@ -48,7 +48,6 @@
 #include "../WindowParameters.hpp"
 
 #ifndef DGL_NO_SHARED_RESOURCES
-# include "NanoVG.hpp"
 # include "src/Resources.hpp"
 #endif
 
@@ -164,11 +163,11 @@ Window::Window() {
 
 	// Set up NanoVG
 	const int nvgFlags = NVG_ANTIALIAS;
+	vg = nvgCreateGL(nvgFlags);
+	DISTRHO_SAFE_ASSERT_RETURN(vg != nullptr,);
 #ifdef NANOVG_GLES2
-	vg = nvgCreateGLES2(nvgFlags);
 	fbVg = nvgCreateSharedGLES2(vg, nvgFlags);
 #else
-	vg = nvgCreateGL2(nvgFlags);
 	fbVg = nvgCreateSharedGL2(vg, nvgFlags);
 #endif