diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java b/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java
index 2f5881e8b7e18be648c8e5afdc42d8dd29256273..8bc5fcad81bb043cdf9042f7e8a3cc9f924b2e56 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java
@@ -99,20 +99,24 @@ public class InitCreateDiagramWizard implements IObjectActionDelegate {
 		Repository model = null;
 		if (diagramRoot instanceof Repository) {
 			model = (Repository) diagramRoot;
-		}
-		//TODO: If  >1 Repository exists: present them to choose one
-		while (it.hasNext()) {
-			EObject possibleRepo = it.next();
-			if (possibleRepo instanceof Repository) {
-				model = (Repository) possibleRepo;
+		} else {
+			//TODO: If  >1 Repository exists: present them to choose one
+			while (it.hasNext()) {
+				EObject possibleRepo = it.next();
+				if (possibleRepo instanceof Repository) {
+					model = (Repository) possibleRepo;
+				}
 			}
 		}
+		
+		/*
+		 * If no model found exit
+		 */
 		if (model == null) {
 			MessageDialog.openError(shell, "No Repository found", "Resource does not contain a 'Repository' EObject");
 			return;
 		}
 		
-		
 		/*
 		 * Create empty diagram
 		 */
@@ -124,11 +128,11 @@ public class InitCreateDiagramWizard implements IObjectActionDelegate {
 		diagram.setDiagramTypeId(diagramTypeId);
 		diagram.setName(fileName);
 		diagramInitializer.initialize(diagram);
+//		diagram.eResource().getContents().add(model);//TODO
 		resource.getContents().add(diagram);
 		
 		//org.eclipselabs.spray.runtime.graphiti.wizard.NewDiagramWizard nutzt das folgende:
 		//public void run(IProgressMonitor monitor) throws InvocationTargetException 
-		
 		try {
 			resource.save(Collections.emptyMap());
 		} catch (IOException e) {