diff --git a/crates/bevy_render/src/render_phase/draw.rs b/crates/bevy_render/src/render_phase/draw.rs
index b21e65e468..73628316f3 100644
--- a/crates/bevy_render/src/render_phase/draw.rs
+++ b/crates/bevy_render/src/render_phase/draw.rs
@@ -315,7 +315,16 @@ impl AddRenderCommand for App {
         <C::Param as SystemParam>::Fetch: ReadOnlySystemParamFetch,
     {
         let draw_function = RenderCommandState::<P, C>::new(&mut self.world);
-        let draw_functions = self.world.get_resource::<DrawFunctions<P>>().unwrap();
+        let draw_functions = self
+            .world
+            .get_resource::<DrawFunctions<P>>()
+            .unwrap_or_else(|| {
+                panic!(
+                    "DrawFunctions<{}> must be added to the world as a resource \
+                     before adding render commands to it",
+                    std::any::type_name::<P>(),
+                );
+            });
         draw_functions.write().add_with::<C, _>(draw_function);
         self
     }