[303826] Updates to AddModuleDependenciesPropertiesPage
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
index 16fd110..b9c9c9b 100644
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
+++ b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
@@ -149,13 +149,16 @@
 		layout.marginWidth = 0;
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		ModuleAssemblyRootPage.createDescriptionComposite(composite,
-				getModuleAssemblyRootPageDescription());
+		createDescriptionComposite(composite);
 		createListGroup(composite);
 		refresh();
 		Dialog.applyDialogFont(parent);
 		return composite;
 	}
+	
+	protected void createDescriptionComposite(Composite parent){
+		ModuleAssemblyRootPage.createDescriptionComposite(parent, getModuleAssemblyRootPageDescription());
+	}
 
 	protected String getModuleAssemblyRootPageDescription() {
 		return Messages.ModuleAssemblyRootPageDescription;
@@ -664,8 +667,10 @@
 					allMappings[i].getSourcePath(), allMappings[i].getRuntimePath()
 			));
 		}
-		editReferenceButton.setEnabled(false);
-		removeButton.setEnabled(false);
+		if(editReferenceButton != null)
+			editReferenceButton.setEnabled(false);
+		if(removeButton != null)
+			removeButton.setEnabled(false);
 		hasInitialized = true;
 	}