diff --git a/panda/src/pgraph/cullableObject.cxx b/panda/src/pgraph/cullableObject.cxx
index 6670e98c0c..ce2f9eb5c3 100644
--- a/panda/src/pgraph/cullableObject.cxx
+++ b/panda/src/pgraph/cullableObject.cxx
@@ -61,6 +61,7 @@ bool CullableObject::
 munge_geom(GraphicsStateGuardianBase *gsg,
            GeomMunger *munger, const CullTraverser *traverser,
            bool force) {
+  nassertr(munger != (GeomMunger *)NULL, false);
   Thread *current_thread = traverser->get_current_thread();
   PStatTimer timer(_munge_geom_pcollector, current_thread);
   if (_geom != (Geom *)NULL) {
diff --git a/panda/src/pgraph/geomTransformer.cxx b/panda/src/pgraph/geomTransformer.cxx
index 7ef76fd456..58d1a339c3 100644
--- a/panda/src/pgraph/geomTransformer.cxx
+++ b/panda/src/pgraph/geomTransformer.cxx
@@ -906,7 +906,7 @@ premunge_geom(const Geom *geom, GeomMunger *munger) {
   CPT(Geom) pgeom = geom;
   munger->premunge_geom(pgeom, vdata);
 
-  PT(Geom) geom_copy = geom->make_copy();
+  PT(Geom) geom_copy = pgeom->make_copy();
   geom_copy->set_vertex_data(vdata);
 
   return geom_copy;