Index: src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java,v
retrieving revision 1.6
diff -u -r1.6 NewTestSuiteCreationWizard.java
--- src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java	29 Oct 2002 13:42:05 -0000	1.6
+++ src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizard.java	6 Feb 2003 17:54:06 -0000
@@ -109,7 +109,8 @@
 
 	protected void postCreatingType() {
 		IType newClass= fPage.getCreatedType();
-		
+		if (newClass == null)
+			return;
 		ICompilationUnit cu= newClass.getCompilationUnit();
 		if (cu.isWorkingCopy()) {
 			cu= (ICompilationUnit) cu.getOriginalElement();
Index: src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java,v
retrieving revision 1.9
diff -u -r1.9 NewTestSuiteCreationWizardPage.java
--- src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java	30 Sep 2002 08:22:07 -0000	1.9
+++ src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java	6 Feb 2003 17:54:06 -0000
@@ -24,6 +24,7 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.internal.junit.ui.IJUnitHelpContextIds;
 import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
+import org.eclipse.jdt.internal.junit.util.ExceptionHandler;
 import org.eclipse.jdt.internal.junit.util.JUnitStatus;
 import org.eclipse.jdt.internal.junit.util.JUnitStubUtility;
 import org.eclipse.jdt.internal.junit.util.LayoutUtil;
@@ -284,8 +285,6 @@
 
 	public static class ClassesInSuitContentProvider implements IStructuredContentProvider {
 			
-		private Object[] fTypes;
-			
 		public ClassesInSuitContentProvider() {
 			super();
 		}
@@ -458,7 +457,9 @@
 			monitor.done();
 			fUpdatedExistingClassButton= true;
 		} catch (JavaModelException e) {
-			JUnitPlugin.log(e);
+			String title= WizardMessages.getString("NewTestSuiteWizPage.error_tile"); //$NON-NLS-1$
+			String message= WizardMessages.getString("NewTestSuiteWizPage.error_message"); //$NON-NLS-1$
+			ExceptionHandler.handle(e, getShell(), title, message);
 		}
 	}
 
Index: src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties
===================================================================
RCS file: /home/eclipse/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties,v
retrieving revision 1.5
diff -u -r1.5 WizardMessages.properties
--- src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties	15 Dec 2002 19:57:32 -0000	1.5
+++ src/org/eclipse/jdt/internal/junit/wizards/WizardMessages.properties	6 Feb 2003 17:54:06 -0000
@@ -16,7 +16,6 @@
 NewTestClassWizPage.title=JUnit TestCase
 NewTestClassWizPage.description=Create a new JUnit TestCase
 NewTestClassWizPage.methodStub.testRunner=&Add TestRunner statement for:
-NewTestClassWizPage.methodStub.constructor=Constructor &from superclass
 NewTestClassWizPage.methodStub.setUp=set&Up()
 NewTestClassWizPage.methodStub.tearDown=tearDow&n()
 NewTestClassWizPage.method.Stub.label=Which method stubs would you like to create?
@@ -24,8 +23,6 @@
 NewTestClassWizPage.class_to_test.browse=B&rowse...
 NewTestClassWizPage.class_to_test.dialog.title=Class To Test
 NewTestClassWizPage.class_to_test.dialog.message=Class for which tests shall be written:
-NewTestClassWizPage.class_to_test.validate_name=Test class
-NewTestClassWizPage.createType.beginTask=Creating type....
 NewTestClassWizPage.marker.message=Implement {0}().
 NewTestClassWizPage.error.superclass.not_exist=Superclass does not exist.
 NewTestClassWizPage.error.superclass.is_interface=Superclass is an interface.
@@ -36,16 +33,12 @@
 NewTestClassWizPage.error.testcase.name_not_valid=Test case name is not valid. 
 NewTestClassWizPage.error.testcase.name_discouraged=Test case name is discouraged. 
 NewTestClassWizPage.error.testcase.already_exists=Test case named ''{0}'' already exists.
-NewTestClassWizPage.error.testcase.already_exists_first_time=Default Test case already exists.
 NewTestClassWizPage.error.class_to_test.not_valid=Test class name is not valid.
 NewTestClassWizPage.error.class_to_test.not_exist=Test class does not exist in current project.
 NewTestClassWizPage.warning.class_to_test.is_interface=Warning: Test class ''{0}'' is an interface.
 NewTestClassWizPage.warning.class_to_test.not_visible=Warning: {0} ''{1}'' is not visible.
 NewTestClassWizPage.comment.class_to_test=Test for {0} {1}
 NewTestClassWizPage.error.junitNotOnbuildpath=JUnit is not on the project\'s buildpath, add the junit.jar to the project\'s buildpath first.
-NewTestClassWizPage.error.junitNotOnbuildpath=JUnit is not on the project\'s buildpath, add the junit.jar to the project\'s buildpath first.
-NewTestClassWizPage.treeCaption.classSelected={0} class selected.
-NewTestClassWizPage.treeCaption.classesSelected={0} classes selected.
 
 Interface=Interface
 Class=Class
@@ -91,6 +84,8 @@
 NewTestSuiteWizPage.typeName.warning.already_exists=Warning: Test suite already exists. suite() method will be replaced.
 NewTestSuiteWizPage.cannotUpdateDialog.title=Cannot update suite() method
 NewTestSuiteWizPage.cannotUpdateDialog.message=The code in suite() that the wizard replaces must start with {0} and end with {1}
+NewTestSuiteWizPage.error_tile=New Test Suite
+NewTestSuiteWizPage.error_message=Creation of new test suite failed:
 
 #
 # UpdateTestSuite
@@ -115,4 +110,3 @@
 # ExceptionHandler
 #
 ExceptionDialog.seeErrorLogMessage= See error log for more details.
-