--- a/NewLauncher.st	Thu Jul 16 13:06:20 2015 +0200
+++ b/NewLauncher.st	Fri Jul 17 11:18:03 2015 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1997-1998 by eXept Software AG
 	      All Rights Reserved
@@ -3512,7 +3510,7 @@
     monticelloLabel := ((resources string:'[Monticello Packages]') asText allItalic colorizeAllWith:Color grey).
     monticelloRoot type:#monticelloRoot.
 
-    MCRepositoryGroup isNil ifTrue:[
+    (MCRepositoryGroup isNil or:[MCRepositoryGroup isLoaded not]) ifTrue:[
         monticelloRoot icon:greyFolderIcon.
         monticelloRoot label:monticelloLabel, (' (Monticello Support not Loaded)' asText colorizeAllWith:Color grey).
     ] ifFalse:[
@@ -5134,20 +5132,22 @@
     <resource: #programMenu >
 
     ^ [
-	|m anyItem hosts|
-
-	m := Menu new.
-
-	hosts := SmallTeam hostsWithChanges asSortedCollection.
-	hosts do:[:eachHost |
-	    |item|
-
-	    item := MenuItem label:eachHost.
-	    item itemValue:#'startBrowserOnChangesOnSmallTeamHost:' argument:eachHost.
-	    m addItem:item.
-	    anyItem := true.
-	].
-	hosts isEmptyOrNil ifTrue:[ nil ] ifFalse:[ m ]
+        |m anyItem hosts|
+
+        m := Menu new.
+
+        SmallTeam notNil ifTrue:[
+            hosts := SmallTeam hostsWithChanges asSortedCollection.
+            hosts do:[:eachHost |
+                |item|
+
+                item := MenuItem label:eachHost.
+                item itemValue:#'startBrowserOnChangesOnSmallTeamHost:' argument:eachHost.
+                m addItem:item.
+                anyItem := true.
+            ].
+        ].
+        hosts isEmptyOrNil ifTrue:[ nil ] ifFalse:[ m ]
     ].
 
     "Created: / 12-11-2006 / 16:06:06 / cg"