diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
index 764834ef96e0..fc43f57f4c4b 100644
--- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
+++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
@@ -214,10 +214,14 @@ public abstract class ProjectWizardTestCase<T extends AbstractProjectWizard> ext
       }
     });
     SelectTemplateSettings.getInstance().setLastTemplate(null, null);
-    UIUtil.dispatchAllInvocationEvents();
-    Thread.sleep(2000); //wait for JBCardLayout release timers
-    UIUtil.dispatchAllInvocationEvents();
-    super.tearDown();
+    try {
+      UIUtil.dispatchAllInvocationEvents();
+      Thread.sleep(2000); //wait for JBCardLayout release timers
+      UIUtil.dispatchAllInvocationEvents();
+    }
+    finally {
+      super.tearDown();
+    }
   }
 
   protected Module importModuleFrom(ProjectImportProvider provider, String path) {