--- a/CodeGeneratorTool.st	Wed Sep 14 12:15:42 2016 +0200
+++ b/CodeGeneratorTool.st	Thu Sep 15 18:43:54 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -837,9 +839,9 @@
 canUseRefactoringSupport
     "check if refactory browser stuff is avaliable"
 
-     ^ RefactoryChangeManager notNil 
-    and:[RefactoryChangeManager isLoaded
-    and:[UserPreferences current useRefactoringSupport]]
+     ^ RefactoryChangeManager notNil and:[RefactoryChangeManager isLoaded 
+        and:[SelectorEnvironment notNil and:[SelectorEnvironment isLoaded
+        and:[UserPreferences current useRefactoringSupport]]]]
 !
 
 methodNameTemplateFor:aSelector