diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs
index ce13474c09..63a5446d75 100644
--- a/voxygen/src/render/renderer.rs
+++ b/voxygen/src/render/renderer.rs
@@ -210,6 +210,16 @@ impl Renderer {
             ),
         )?;
 
+        // Set error handler for wgpu errors
+        // This is better for use than their default because it includes the error in
+        // the panic message
+        device.on_uncaptured_error(|error| {
+            panic!(
+                "wgpu error (handling all wgpu errors as fatal): {:?}",
+                error
+            )
+        });
+
         let profiler_features_enabled = device
             .features()
             .contains(wgpu_profiler::GpuProfiler::REQUIRED_WGPU_FEATURES);