--- a/devtools/testlib.py	Tue Apr 06 18:51:17 2010 +0200
+++ b/devtools/testlib.py	Tue Apr 06 19:08:07 2010 +0200
@@ -363,9 +363,11 @@
         self.vreg._loadedmods.setdefault(self.__module__, {})
         for obj in appobjects:
             self.vreg.register(obj)
-        yield
-        for obj in appobjects:
-            self.vreg.unregister(obj)
+        try:
+            yield
+        finally:
+            for obj in appobjects:
+                self.vreg.unregister(obj)
 
     # vregistry inspection utilities ###########################################