diff --git a/panda/src/express/memoryInfo.cxx b/panda/src/express/memoryInfo.cxx
index 3b2f0f3bcf..6c9dc0387c 100644
--- a/panda/src/express/memoryInfo.cxx
+++ b/panda/src/express/memoryInfo.cxx
@@ -108,6 +108,8 @@ determine_dynamic_type() {
           << " and make sure that all are being initialized.\n";
         _dynamic_type = _static_type;
         _flags &= ~F_reconsider_dynamic_type;
+
+        nassert_raise("Unregistered type.");
         return;
       }
 
diff --git a/panda/src/express/memoryUsage.cxx b/panda/src/express/memoryUsage.cxx
index a7fb8467ed..938a1099e1 100644
--- a/panda/src/express/memoryUsage.cxx
+++ b/panda/src/express/memoryUsage.cxx
@@ -377,9 +377,11 @@ MemoryUsage() {
 
   // count-memory-usage is a much lighter-weight version, and only
   // tracks the total memory allocation.  However, it only works for
-  // certain build environments.
+  // certain build environments (in particular, only in an Opt1 or
+  // Opt2 build on Windows).
 #if defined(WIN32_VC) && defined(_DEBUG)
-  _count_memory_usage = config_express.GetBool("count-memory-usage", false);
+  _count_memory_usage = config_express.GetBool("count-memory-usage", 
+                                               _track_memory_usage);
 #else
   _count_memory_usage = false;
 #endif