--- a/FileBasedSourceCodeManagementSettingsAppl.st	Tue Jul 16 14:44:43 2019 +0200
+++ b/FileBasedSourceCodeManagementSettingsAppl.st	Tue Jul 16 14:51:11 2019 +0200
@@ -534,31 +534,32 @@
 !FileBasedSourceCodeManagementSettingsAppl methodsFor:'change & update'!
 
 selectedPerModulePathChanged
-    |module entry|
+    |module entry newRemoveEnabled newPerModuleRootModule newPerModuleRoot|
 
     self acceptChannel value:true. 
 
-    module := self selectedPerModulePath value.
-    module isNil ifTrue:[ 
-        self removeEnabled value:false.
-        self perModulePathModule value:' '.
-        self perModulePath value:''.
-        ^ self
-    ].
+    newRemoveEnabled := false.
+    newPerModuleRootModule := ' '.
+    newPerModuleRoot := ''.
 
-    entry := pathPerModule at:module ifAbsent:#().    
-    (entry first = FileBasedSourceCodeManager) ifTrue:[
-        self removeEnabled value:true.
-        self perModulePathModule value:module.
-        self perModulePath value:(entry at:2).
-    ] ifFalse:[
-        self removeEnabled value:false.
-        self perModulePathModule value:module , ' ',('<< use ',entry first managerTypeName,' >>') allBold.
-        self perModulePath value:''.
+    module := self selectedPerModulePath value.
+    module notNil ifTrue:[ 
+        entry := pathPerModule at:module ifAbsent:#().    
+        (entry first = FileBasedSourceCodeManager) ifTrue:[
+            newRemoveEnabled := true.
+            newPerModuleRootModule := module.
+            newPerModuleRoot := (entry at:2).
+        ] ifFalse:[
+            newPerModuleRootModule := module,' ',('<< use ',entry first managerTypeName,' >>') allBold.
+        ].
     ].
+    
+    self removeEnabled value:newRemoveEnabled.
+    self perModulePathModule value:newPerModuleRootModule.
+    self perModulePath value:newPerModuleRoot.
 
     "Created: / 21-12-2011 / 14:35:04 / cg"
-    "Modified: / 16-07-2019 / 14:35:17 / Claus Gittinger"
+    "Modified: / 16-07-2019 / 14:50:56 / Claus Gittinger"
 !
 
 update:something with:aParameter from:changedObject