diff --git a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java
index 47c9cd9a726..19a2b6a1109 100644
--- a/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java
+++ b/core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/process/ProcessRunner.java
@@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IStatus;
  */
 public abstract class ProcessRunner {
 	
-	private ProcessParameter[] params;
+	private ProcessParameter[] params = new ProcessParameter[0];
 	
 	void setProcessParameters(ProcessParameter[] params) {
-		this.params = params;
+		this.params = params == null ? new ProcessParameter[0] : params;
 	}
 	
 	/**
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java
index e9254a6d9d5..269ea040128 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java
@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
+import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
 import org.eclipse.cdt.ui.templateengine.event.PatternEvent;
 import org.eclipse.cdt.ui.templateengine.event.PatternEventListener;
 import org.eclipse.cdt.ui.templateengine.uitree.UIElement;
@@ -33,7 +34,7 @@ import org.eclipse.cdt.ui.templateengine.uitree.UIElement;
  * WizardPage.
  */
 
-public class UIWizardPage extends UIPage implements IWizardPage, PatternEventListener {
+public class UIWizardPage extends UIPage implements IWizardDataPage, PatternEventListener {
 
 	/**
 	 * This map will contain reference to the source widgets, which has generated the