--- a/crashanalysis/crashanalyser/com.nokia.s60tools.crashanalyser/src/com/nokia/s60tools/crashanalyser/ui/wizards/FileOrPathSelectionPage.java	Tue Feb 23 17:04:33 2010 +0200
+++ b/crashanalysis/crashanalyser/com.nokia.s60tools.crashanalyser/src/com/nokia/s60tools/crashanalyser/ui/wizards/FileOrPathSelectionPage.java	Tue Apr 20 14:41:43 2010 +0300
@@ -195,7 +195,9 @@
 			DirectoryDialog dialog = new DirectoryDialog(this.getShell());
 			dialog.setText("Select crash files path");
 			String result = dialog.open();
-			comboFileOrPath.setText(result);
+			
+			if (result != null)
+				comboFileOrPath.setText(result);
 			
 		// browse file button
 		} else if (e.widget == buttonBrowseFile){
@@ -208,7 +210,9 @@
 									"*."+CrashAnalyserFile.ELF_CORE_DUMP_FILE_EXTENSION};
 	        dialog.setFilterExtensions(filterExt);			
 			String result = dialog.open();
-			comboFileOrPath.setText(result);
+			
+			if(result != null)
+				comboFileOrPath.setText(result);
 			
 		// Read Files from Device button
 		} else if (e.widget == buttonReadFilesFromDevice) {
@@ -252,15 +256,8 @@
 				}
 			// user has selected a single file
 			} else if (file.isFile() && file.exists()) {
-				// file seems to be a known crash file type
-				if (DecoderEngine.isFileValidCrashFile(file)) {
 					this.setErrorMessage(null);
 					return true;
-				// file type is not a crash file
-				} else {
-					this.setErrorMessage("Invalid file");
-					return false;
-				}
 			// user has not selected a folder nor a file
 			} else {
 				this.setErrorMessage("Invalid file or folder.");