diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index d100edbfac63e9c88f16d2c3e2626862530ec70e..e32eb394e012b3861f724bee2a2291fe19a058e0 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -48,11 +48,10 @@ class ComponentAccumulator(object):
 
     def __del__(self):
         if not self._wasMerged and not self.empty():
-            #raise ConfigurationError("This componentAccumulator was never merged!")
-            log = logging.getLogger("ComponentAccumulator")
-            log.error("The ComponentAccumulator listed below was never merged!")
-            self.printConfig()
-        pass
+            raise RuntimeError("ComponentAccumulator was not merged!")
+            #log = logging.getLogger("ComponentAccumulator")
+            #log.error("The ComponentAccumulator listed below was never merged!")
+        #pass
     
 
 
@@ -395,7 +394,7 @@ class ComponentAccumulator(object):
     def merge(self,other):
         """ Merging in the other accumulator """
         if other is None: 
-            return
+            raise RuntimeError("merge called on object of type None: did you forget to return a CA from a config function?")
 
         if isinstance(other,collections.Sequence):
             self._msg.error("Merge called with a: %s "  % str(type(other)) + " of length: %d " % len(other))
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
index c4cf7b1609705f8b8f1a4aceb997b58b704595e7..b755b44d9d22b8008a06275c0013956f86dad95e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
@@ -294,7 +294,7 @@ def TrigInDetConfig( flags ):
   acc.addService(mag_field_svc)
 
 
-  return acc
+  #return acc
 
 if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable