diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java
index 9b0c881..6e896df 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java
@@ -80,7 +80,9 @@
 			getProjectSpace().save();
 			getProjectSpace().startChangeRecording();
 			getProgressMonitor().done();
+			return null;
 		}
+
 		getProgressMonitor().subTask(Messages.ShareController_Sharing_Project_With_Server);
 
 		// make sure, current state of caches is written to resource
@@ -115,6 +117,7 @@
 		getProgressMonitor().subTask(Messages.ShareController_Finalizing_Share);
 		getProjectSpace().getLocalChangePackage().clear();
 		getProjectSpace().save();
+		// TODO EM: do we really need to save 3 times in row?!
 		getProjectSpace().updateDirtyState();
 
 		getProgressMonitor().done();