Index: libcfa/src/parseconfig.cfa
===================================================================
--- libcfa/src/parseconfig.cfa	(revision c166f4ef9b8229c662d3f3ddbfa422165e20e6b4)
+++ libcfa/src/parseconfig.cfa	(revision e1e506bb9196fe85e0db2a3991e4ec8a51573d1f)
@@ -8,4 +8,10 @@
 // *********************************** exceptions ***********************************
 
+
+static vtable(Missing_Config_Entries) Missing_Config_Entries_vt;
+
+void ?{}( Missing_Config_Entries & this ) with ( this ) {
+	virtual_table = &Missing_Config_Entries_vt;
+}
 
 static vtable(Parse_Failure) Parse_Failure_vt;
@@ -136,4 +142,8 @@
 		}
 	}
+	if ( entries_so_far < num_entries ) {
+		delete( kv_pairs );
+		throw (Missing_Config_Entries){};
+	}
 
 	delete( kv_pairs );
Index: libcfa/src/parseconfig.hfa
===================================================================
--- libcfa/src/parseconfig.hfa	(revision c166f4ef9b8229c662d3f3ddbfa422165e20e6b4)
+++ libcfa/src/parseconfig.hfa	(revision e1e506bb9196fe85e0db2a3991e4ec8a51573d1f)
@@ -58,4 +58,8 @@
 
 
+exception Missing_Config_Entries {};
+
+void ?{}( Missing_Config_Entries & this );
+
 exception Parse_Failure {};