--- a/AbstractSettingsApplication.st	Sat May 14 15:30:03 2016 +0200
+++ b/AbstractSettingsApplication.st	Sat May 14 15:42:46 2016 +0200
@@ -16579,27 +16579,33 @@
 !AbstractSettingsApplication::SourceCodeManagementSettingsAppl methodsFor:'change & update'!
 
 selectedPerModuleRootChanged
-    |module entry|
-
+    |module entry firstEntry
+     removeEnabled perModuleRootModule perModuleRoot|
+
+    
     self acceptChannel value:true.
     module := self selectedPerModuleRoot value.
     module isNil ifTrue:[
-        self removeEnabled value:false.
-        self perModuleRootModule value:' '.
-        self perModuleRoot value:''.
-        ^ self
-    ].
-
-    entry := rootsPerModule at:module ifAbsent:#().
-    (entry first = CVSSourceCodeManager) ifTrue:[
-        self removeEnabled value:true.
-        self perModuleRootModule value:module.
-        self perModuleRoot value:(entry at:2).
+        removeEnabled := false.
+        perModuleRootModule := ' '.
+        perModuleRoot := ''.
     ] ifFalse:[
-        self removeEnabled value:false.
-        self perModuleRootModule value:module , ' ',('<<use ',entry first managerTypeName,'>>') allBold.
-        self perModuleRoot value:''.
-    ].
+        entry := rootsPerModule at:module ifAbsent:#().
+        firstEntry := entry first.
+        (firstEntry = CVSSourceCodeManager) ifTrue:[
+            removeEnabled := true.
+            perModuleRootModule := module.
+            perModuleRoot := (entry at:2).
+        ] ifFalse:[
+            removeEnabled := false.
+            perModuleRootModule := module , ' ',('<<use ',firstEntry managerTypeName,'>>') allBold.
+            perModuleRoot := ''.
+        ].
+    ].
+    
+    self removeEnabled value:removeEnabled.
+    self perModuleRootModule value:perModuleRootModule.
+    self perModuleRoot value:perModuleRoot.
 !
 
 sourceDirChanged