1 files changed, 17 insertions, 10 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportAllWizard.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportAllWizard.java
index 0bf0faa0795..8a3af3115b6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportAllWizard.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.export/src/org/eclipse/papyrus/infra/gmfdiag/export/wizard/ExportAllWizard.java
@@ -118,19 +118,26 @@ public class ExportAllWizard extends Wizard implements IExportWizard {
 		if (file != null) {
 			IContainer parentResource = file.getParent();
 			parentResource = ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(parentResource.getLocation());
-			uriFile = URI.createPlatformResourceURI(parentResource.getLocation().toString(), true);
-
-		}
-
-		if (parameter == null) {
-			pageError = new ExportDiagramsErrorPage();
-			addPage(pageError);
+			if (parentResource != null) {
+				uriFile = URI.createPlatformResourceURI(parentResource.getLocation().toString(), true);
+
+				if (parameter == null) {
+					addErrorPage();
+				} else {
+					page = new ExportDiagramsPage(uriFile);
+					addPage(page);
+				}
+			} else {
+				addErrorPage();
+			}
 		} else {
-			page = new ExportDiagramsPage(uriFile);
-			addPage(page);
+			addErrorPage();
 		}
+	}
 
-
+	private void addErrorPage() {
+		pageError = new ExportDiagramsErrorPage();
+		addPage(pageError);
 	}
 
 	/**