--- a/MercurialSourceCodeManagementSettingsAppl.st	Tue Jul 16 14:59:07 2019 +0200
+++ b/MercurialSourceCodeManagementSettingsAppl.st	Tue Jul 16 14:59:22 2019 +0200
@@ -1170,30 +1170,32 @@
 !MercurialSourceCodeManagementSettingsAppl methodsFor:'change & update'!
 
 selectedPerModuleRepositoryChanged
-    |repository entry|
+    |module entry newRemoveEnabled newPerModuleRootModule newPerModuleRoot|
 
     self acceptChannel value:true.    
-    repository := self selectedPerModuleRepository value.
-    repository isNil ifTrue:[ 
-        self removeEnabled value:false.
-        self perModuleRepositoryModule value:' '.
-        self perModuleRepository value:''.
-        ^ self
+
+    newRemoveEnabled := false.
+    newPerModuleRootModule := ' '.
+    newPerModuleRoot := ''.
+
+    module := self selectedPerModuleRepository value.
+    module notNil ifTrue:[ 
+        entry := repositoriesPerModule at:module ifAbsent:#().    
+        (entry first = MercurialSourceCodeManager) ifTrue:[
+            newRemoveEnabled := true.
+            newPerModuleRootModule := module.
+            newPerModuleRoot := (entry at:2).
+        ] ifFalse:[
+            newPerModuleRootModule := module,' ',('<< use ',entry first managerTypeName,' >>') allBold.
+        ].
     ].
 
-    entry := repositoriesPerModule at:repository ifAbsent:#().    
-    (entry first = MercurialSourceCodeManager) ifTrue:[
-        self removeEnabled value:true.
-        self perModuleRepositoryModule value:repository.
-        self perModuleRepository value:(entry at:2).
-    ] ifFalse:[
-        self removeEnabled value:false.
-        self perModuleRepositoryModule value:repository , ' ',('<< use ',entry first managerTypeName,' >>') allBold.
-        self perModuleRepository value:''.
-    ].
+    self removeEnabled value:newRemoveEnabled.
+    self perModuleRepositoryModule value:newPerModuleRootModule.
+    self perModuleRepository value:newPerModuleRoot.
 
     "Created: / 14-01-2012 / 20:24:57 / cg"
-    "Modified: / 16-07-2019 / 14:35:02 / Claus Gittinger"
+    "Modified (format): / 16-07-2019 / 14:58:49 / Claus Gittinger"
 !
 
 update:something with:aParameter from:changedObject