diff --git a/data/org.eclipse.birt.report.data.oda.excel.ui/src/org/eclipse/birt/report/data/oda/excel/ui/wizards/ExcelFileSelectionWizardPage.java b/data/org.eclipse.birt.report.data.oda.excel.ui/src/org/eclipse/birt/report/data/oda/excel/ui/wizards/ExcelFileSelectionWizardPage.java
index f28e15c9daa..5bbeae8b6ac 100644
--- a/data/org.eclipse.birt.report.data.oda.excel.ui/src/org/eclipse/birt/report/data/oda/excel/ui/wizards/ExcelFileSelectionWizardPage.java
+++ b/data/org.eclipse.birt.report.data.oda.excel.ui/src/org/eclipse/birt/report/data/oda/excel/ui/wizards/ExcelFileSelectionWizardPage.java
@@ -228,10 +228,10 @@ private void initializeControl() {
 			return; // nothing to initialize
 
 		String queryText = dataSetDesign.getQueryText();
-		if (queryText == null)
+		if (queryText == null || selectedFile == null)
 			return; // nothing to initialize
-
-        updateValuesFromQuery(queryText);
+        
+		updateValuesFromQuery(queryText);
 
 		if (dataSetDesign.getPublicProperties() != null) {
 			currentSheetName = dataSetDesign.getPublicProperties().getProperty(
@@ -1325,7 +1325,7 @@ private void updateValuesFromQuery(String queryText) {
 		    validateHasSelectedColumns();
 			return;
 		}
-		if ( isNewFile( queryText, getFileName( selectedFile ) ) )
+		if (selectedFile != null && isNewFile( queryText, getFileName( selectedFile ) ) )
         {
         	updateColumnsFromQuery(queryText, selectedFile);
         }
@@ -1580,7 +1580,12 @@ private void savePage(DataSetDesign dataSetDesign) {
 			return;
 		dataSetDesign.setQueryText(queryText);
         savePublicProperties(dataSetDesign);
-
+        
+        if ( selectedFile == null )
+        {
+        	 dataSetDesign.setResultSets(null);
+             return;
+        }
 		if( ! validateHasSelectedColumns() )
 		{
 		    // don't prepare query; simply reset result set definition