Index: /trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py	(revision 61431)
+++ /trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py	(revision 61432)
@@ -434,5 +434,5 @@
     def _actionUserEdit(self):
         """ Action wrapper. """
-        from testmanager.core.useraccount              import UserAccountData, UserAccountLogic;
+        from testmanager.core.useraccount              import UserAccountData;
         from testmanager.webui.wuiadminuseraccount     import WuiUserAccount;
         return self._actionGenericFormEdit(UserAccountData, WuiUserAccount, UserAccountData.ksParam_uid);
@@ -544,5 +544,5 @@
     def _actionTestBoxEdit(self):
         """ Action wrapper. """
-        from testmanager.core.testbox                  import TestBoxData, TestBoxLogic;
+        from testmanager.core.testbox                  import TestBoxData;
         from testmanager.webui.wuiadmintestbox         import WuiTestBox;
         return self._actionGenericFormEdit(TestBoxData, WuiTestBox, TestBoxData.ksParam_idTestBox);
@@ -557,5 +557,4 @@
         """ Action wrapper. """
         from testmanager.core.testbox                  import TestBoxData, TestBoxLogic;
-        from testmanager.webui.wuiadmintestbox         import WuiTestBox;
         return self._actionGenericDoRemove(TestBoxLogic, TestBoxData.ksParam_idTestBox, self.ksActionTestBoxList);
 
@@ -694,5 +693,5 @@
     def _actionTestCaseEdit(self):
         """ Action wrapper. """
-        from testmanager.core.testcase                  import TestCaseDataEx, TestCaseLogic;
+        from testmanager.core.testcase                  import TestCaseDataEx;
         from testmanager.webui.wuiadmintestcase         import WuiTestCase;
         return self._actionGenericFormEdit(TestCaseDataEx, WuiTestCase, TestCaseDataEx.ksParam_idTestCase);
@@ -871,5 +870,4 @@
         """ Action wrapper. """
         from testmanager.core.buildsource               import BuildSourceData, BuildSourceLogic;
-        from testmanager.webui.wuiadminbuildsource      import WuiAdminBuildSrc;
         return self._actionGenericDoRemove(BuildSourceLogic, BuildSourceData.ksParam_idBuildSrc, self.ksActionBuildSrcList);
 
@@ -923,5 +921,4 @@
         """ Action wrapper. """
         from testmanager.core.build                     import BuildData, BuildLogic;
-        from testmanager.webui.wuiadminbuild            import WuiAdminBuild;
         return self._actionGenericDoRemove(BuildLogic, BuildData.ksParam_idBuild, self.ksActionBuildList);
 
@@ -963,5 +960,5 @@
     def _actionBuildCategoryClone(self):
         """ Action wrapper. """
-        from testmanager.core.build                     import BuildCategoryData, BuildCategoryLogic;
+        from testmanager.core.build                     import BuildCategoryData;
         from testmanager.webui.wuiadminbuildcategory    import WuiAdminBuildCat;
         return self._actionGenericFormClone(BuildCategoryData, WuiAdminBuildCat, 'idBuildCategory');
@@ -976,5 +973,4 @@
         """ Action wrapper. """
         from testmanager.core.build                     import BuildCategoryData, BuildCategoryLogic;
-        from testmanager.webui.wuiadminbuildcategory    import WuiAdminBuildCat;
         return self._actionGenericDoRemove(BuildCategoryLogic, BuildCategoryData.ksParam_idBuildCategory,
                                            self.ksActionBuildCategoryList)
@@ -992,5 +988,5 @@
     def _actionBuildBlacklistAdd(self):
         """ Action wrapper. """
-        from testmanager.core.buildblacklist            import BuildBlacklistData, BuildBlacklistLogic;
+        from testmanager.core.buildblacklist            import BuildBlacklistData;
         from testmanager.webui.wuiadminbuildblacklist   import WuiAdminBuildBlacklist;
         return self._actionGenericFormAdd(BuildBlacklistData, WuiAdminBuildBlacklist);
@@ -1005,5 +1001,5 @@
     def _actionBuildBlacklistClone(self):
         """ Action wrapper. """
-        from testmanager.core.buildblacklist            import BuildBlacklistData, BuildBlacklistLogic;
+        from testmanager.core.buildblacklist            import BuildBlacklistData;
         from testmanager.webui.wuiadminbuildblacklist   import WuiAdminBuildBlacklist;
         return self._actionGenericFormClone(BuildBlacklistData, WuiAdminBuildBlacklist, 'idBlacklisting');
@@ -1018,5 +1014,4 @@
         """ Action wrapper. """
         from testmanager.core.buildblacklist            import BuildBlacklistData, BuildBlacklistLogic;
-        from testmanager.webui.wuiadminbuildblacklist   import WuiAdminBuildBlacklist;
         return self._actionGenericDoRemove(BuildBlacklistLogic, BuildBlacklistData.ksParam_idBlacklisting,
                                            self.ksActionBuildBlacklist);
@@ -1024,5 +1019,5 @@
     def _actionBuildBlacklistEdit(self):
         """ Action wrapper. """
-        from testmanager.core.buildblacklist            import BuildBlacklistData, BuildBlacklistLogic;
+        from testmanager.core.buildblacklist            import BuildBlacklistData;
         from testmanager.webui.wuiadminbuildblacklist   import WuiAdminBuildBlacklist;
         return self._actionGenericFormEdit(BuildBlacklistData, WuiAdminBuildBlacklist, BuildBlacklistData.ksParam_idBlacklisting);
@@ -1047,5 +1042,5 @@
     def _actionFailureCategoryAdd(self):
         """ Action wrapper. """
-        from testmanager.core.failurecategory           import FailureCategoryData, FailureCategoryLogic;
+        from testmanager.core.failurecategory           import FailureCategoryData;
         from testmanager.webui.wuiadminfailurecategory  import WuiFailureCategory;
         return self._actionGenericFormAdd(FailureCategoryData, WuiFailureCategory);
@@ -1068,5 +1063,4 @@
         """ Action wrapper. """
         from testmanager.core.failurecategory           import FailureCategoryData, FailureCategoryLogic;
-        from testmanager.webui.wuiadminfailurecategory  import WuiFailureCategory;
         return self._actionGenericDoRemove(FailureCategoryLogic, FailureCategoryData.ksParam_idFailureCategory,
                                            self.ksActionFailureCategoryList);
@@ -1074,5 +1068,5 @@
     def _actionFailureCategoryEdit(self):
         """ Action wrapper. """
-        from testmanager.core.failurecategory           import FailureCategoryData, FailureCategoryLogic;
+        from testmanager.core.failurecategory           import FailureCategoryData;
         from testmanager.webui.wuiadminfailurecategory  import WuiFailureCategory;
         return self._actionGenericFormEdit(FailureCategoryData, WuiFailureCategory,
@@ -1097,5 +1091,5 @@
     def _actionFailureReasonAdd(self):
         """ Action wrapper. """
-        from testmanager.core.failurereason             import FailureReasonData, FailureReasonLogic;
+        from testmanager.core.failurereason             import FailureReasonData;
         from testmanager.webui.wuiadminfailurereason    import WuiAdminFailureReason;
         return self._actionGenericFormAdd(FailureReasonData, WuiAdminFailureReason);
@@ -1117,5 +1111,4 @@
         """ Action wrapper. """
         from testmanager.core.failurereason             import FailureReasonData, FailureReasonLogic;
-        from testmanager.webui.wuiadminfailurereason    import WuiAdminFailureReason;
         return self._actionGenericDoRemove(FailureReasonLogic, FailureReasonData.ksParam_idFailureReason,
                                            self.ksActionFailureReasonList);
@@ -1123,5 +1116,5 @@
     def _actionFailureReasonEdit(self):
         """ Action wrapper. """
-        from testmanager.core.failurereason             import FailureReasonData, FailureReasonLogic;
+        from testmanager.core.failurereason             import FailureReasonData;
         from testmanager.webui.wuiadminfailurereason    import WuiAdminFailureReason;
         return self._actionGenericFormEdit(FailureReasonData, WuiAdminFailureReason);
Index: /trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py	(revision 61431)
+++ /trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py	(revision 61432)
@@ -32,4 +32,5 @@
 # Standard python imports.
 import os;
+import sys;
 
 # Validation Kit imports.
@@ -833,4 +834,6 @@
         sRedirAction is what action to redirect to on success.
         """
+        import cgitb;
+
         idEntry = self.getIntParam(sParamId, iMin = 1, iMax = 0x7ffffffe)
         fCascade = self.getBoolParam('fCascadeDelete', False);