diff --git a/dgl/src/WindowPrivateData.cpp b/dgl/src/WindowPrivateData.cpp
index 08985995..5c8b8fa8 100644
--- a/dgl/src/WindowPrivateData.cpp
+++ b/dgl/src/WindowPrivateData.cpp
@@ -574,7 +574,9 @@ void Window::PrivateData::onPuglConfigure(const double width, const double heigh
 
     const uint uwidth = static_cast<uint>(width + 0.5);
     const uint uheight = static_cast<uint>(height + 0.5);
-    self->onReshape(uwidth, uheight);
+
+    if (self != nullptr)
+        self->onReshape(uwidth, uheight);
 
 #ifndef DPF_TEST_WINDOW_CPP
     if (topLevelWidget != nullptr)
diff --git a/dgl/src/pugl-upstream b/dgl/src/pugl-upstream
index 5a4d2469..c5a5eb4c 160000
--- a/dgl/src/pugl-upstream
+++ b/dgl/src/pugl-upstream
@@ -1 +1 @@
-Subproject commit 5a4d2469a72ad072a0e2397477a2cd701c2ca309
+Subproject commit c5a5eb4cdcb12dc8d74be4f5fbb335e8b3eac711