--- geom_subr.c.orig	Sat Jan 17 01:19:58 2004
+++ geom_subr.c	Sat Jan 17 01:21:51 2004
@@ -84,6 +84,7 @@
 	hh = arg;
 	mp = hh->mp;
 	g_free(hh);
+	KASSERT(mp->name != NULL, ("Cannot load class without a name"));
 	g_trace(G_T_TOPOLOGY, "g_load_class(%s)", mp->name);
 	LIST_FOREACH(mp2, &g_classes, class) {
 		KASSERT(mp2 != mp,
@@ -365,6 +366,10 @@
 	va_list ap;
 
 	g_topology_assert();
+	KASSERT(gp->start != NULL,
+	    ("g_new_providerf on geom(%s) (class %s) without start",
+	    gp->name, gp->class->name));
+
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	va_start(ap, fmt);
 	sbuf_vprintf(sb, fmt, ap);