diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java
index bb0fdc63efb..2b33c2a5e3d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java
@@ -9,6 +9,7 @@ import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.internal.ui.CPlugin;
 import org.eclipse.cdt.ui.wizards.CProjectWizard;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.swt.widgets.TabFolder;
@@ -115,9 +116,14 @@ public abstract class ConversionWizard
      */
     protected void doRun(IProgressMonitor monitor) {
         doRunPrologue(monitor);
-        mainPage.doRun(monitor, getProjectID());
-        doRunEpilogue(monitor);
-        monitor.done();
+        try{
+            mainPage.doRun(monitor, getProjectID());
+        } catch (CoreException ce){
+            CCorePlugin.log(ce);
+        } finally{
+            doRunEpilogue(monitor);
+            monitor.isCanceled();
+        }
     }
     /**
      * Return the type of project that it is being converted to
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
index ac55c0069f7..9f10930748e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
@@ -373,26 +373,19 @@ public abstract class ConvertProjectWizardPage
      * 
      * @param monitor
      * @param projectID
+     * @exception CoreException
      */
-    public void doRun(IProgressMonitor monitor, String projectID) {
+    public void doRun(IProgressMonitor monitor, String projectID) throws CoreException {
 
         Object[] selection = getCheckedElements();
         int      totalSelected = selection.length;
 
         if ((selection != null) && (totalSelected > 0)) {
-
             if (monitor == null) {
                 monitor = new NullProgressMonitor();
             }
-
             monitor.beginTask(CPlugin.getResourceString(KEY_TITLE), 1);
-
-            try {
-                convertProjects(selection, monitor, projectID);
-            }
-             catch (CoreException ce) {
-                CPlugin.log(ce);
-            }
+            convertProjects(selection, monitor, projectID);
         }
     }