diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbDialog.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbDialog.java
index 1827911b92..6c0c0005b6 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbDialog.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbDialog.java
@@ -226,7 +226,7 @@ private Composite createDynamicVdbInfoPanel(Composite parent) {
 			@Override
 			public void modifyText(final ModifyEvent event) {
 				vdbManager.setOutputVdbName(dynamicVdbName.getText());
-				resetDynamicVdb();
+				resetDynamicVdb(true);
 				validatePage();
 			}
 		});
@@ -244,7 +244,7 @@ public void modifyText(final ModifyEvent event) {
 			@Override
 			public void modifyText(ModifyEvent e) {
 				vdbManager.setVersion(vdbVersionText.getText());
-				resetDynamicVdb();
+				resetDynamicVdb(true);
 				validatePage();
 			}
 		});
@@ -260,7 +260,7 @@ public void modifyText(ModifyEvent e) {
 			@Override
 			public void modifyText(final ModifyEvent event) {
 				vdbManager.setOutputVdbFileName(dynamicVdbFileName.getText());
-				resetDynamicVdb();
+				resetDynamicVdb(true);
 				validatePage();
 			}
 		});
@@ -281,7 +281,7 @@ private Composite createOptionsPanel(Composite parent) {
 			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				vdbManager.setExcludeSourceMetadata(excludeSourceDdlButton.getSelection());
-				resetDynamicVdb();
+				resetDynamicVdb(true);
 				validatePage();
 			}
 		});
@@ -303,16 +303,16 @@ public void widgetSelected(SelectionEvent e) {
                 //
                 // Reset the dynamic vdb
                 //
-                resetDynamicVdb();
+                resetDynamicVdb(true);
             }
         });
 
 		return thePanel;
 	}
     
-    private void resetDynamicVdb() {
+    private void resetDynamicVdb(boolean ignoreWarning) {
         vdbManager.setDynamicVdb(null);
-        vdbManager.generate();
+        vdbManager.generate(ignoreWarning);
 		try {
 			refreshXml();
 		} catch (Exception ex) {
@@ -468,7 +468,7 @@ private void setXmlEditiable(boolean canEdit) {
 		}
 		resetButton.setEnabled(canEdit);
 		if( !canEdit ) {
-			vdbManager.generate();
+			vdbManager.generate(false);
             //IStatus status = vdbManager.getStatus();
             setXmlContents(getVdbXml());
 		}
@@ -669,7 +669,7 @@ protected Control createContents(Composite parent) {
 		// TODO Auto-generated method stub
 		Control control = super.createContents(parent);
 		
-		resetDynamicVdb();
+		resetDynamicVdb(false);
 		
 		return control;
 	}
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbManager.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbManager.java
index b1d528154b..754255b49f 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbManager.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbManager.java
@@ -125,7 +125,7 @@ private void checkDynamicVdbGenerated() throws Exception {
     /**
      * Generate the dynamic xml from the xmi vdb
      */
-    public void generate() {
+    public void generate(final boolean ignoreWarning) {
         if (!isGenerateRequired())
             return;
 
@@ -171,7 +171,7 @@ public void run() {
 		        				
 		        				String title = DqpUiConstants.UTIL.getString("GenerateDynamicVdbManager.generateDynamicVdbStatus");
 		        				
-				            	if( vdbStatus.getSeverity() == IStatus.WARNING ) {
+				            	if( vdbStatus.getSeverity() == IStatus.WARNING && !ignoreWarning ) {
 				            		ListMessageDialog.openWarning(
 				            				UiUtil.getWorkbenchShellOnlyIfUiThread(), 
 				            				title,
diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbPageTwo.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbPageTwo.java
index b99364babc..b63974f8ab 100644
--- a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbPageTwo.java
+++ b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/wizards/vdbs/GenerateDynamicVdbPageTwo.java
@@ -209,7 +209,7 @@ private void createButtonPanel(Composite parent) {
             generateXmlButton.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
-                    vdbManager.generate();
+                    vdbManager.generate(false);
                     refreshXml();
                     validatePage();
                 }
diff --git a/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java b/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java
index 0b99a2f8f5..6656768965 100644
--- a/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java
+++ b/plugins/org.teiid.designer.vdb.ui/src/org/teiid/designer/vdb/ui/editor/VdbEditor.java
@@ -1797,7 +1797,7 @@ public void widgetSelected( final SelectionEvent event ) {
         { // execute VDB button
         	exportDynamicVdbButton = WidgetFactory.createButton(extraButtonPanel, i18n("saveAsXml"), //$NON-NLS-1$
                     GridData.HORIZONTAL_ALIGN_BEGINNING);
-        	exportDynamicVdbButton.setToolTipText(i18n("saveAsXmlTooltip"));
+        	exportDynamicVdbButton.setToolTipText(i18n("saveAsXmlTooltip")); //$NON-NLS-1$
         	exportDynamicVdbButton.addSelectionListener(new SelectionAdapter() {
                 /**
                  * {@inheritDoc}