diff --git a/src/config.h b/src/config.h
index 7dfba144..ac15f779 100644
--- a/src/config.h
+++ b/src/config.h
@@ -124,5 +124,6 @@
 				 * "make bin/rtl8139.dsk bs" */
 #undef	BUILD_ID		/* Include a custom build ID string,
 				 * e.g "test-foo" */
+#undef	NULL_TRAP		/* Attempt to catch NULL function calls */
 
 /* @END general.h */
diff --git a/src/core/config.c b/src/core/config.c
index ce92d90a..3a57ffd5 100644
--- a/src/core/config.c
+++ b/src/core/config.c
@@ -199,3 +199,11 @@ REQUIRE_OBJECT ( wince );
 #ifdef	PXE_IMAGE
 REQUIRE_OBJECT ( pxe );
 #endif
+
+/*
+ * Drag in miscellaneous objects
+ *
+ */
+#ifdef	NULL_TRAP
+REQUIRE_OBJECT ( nulltrap );
+#endif