--- a/Autoload.st	Thu Apr 23 08:04:13 2015 +0100
+++ b/Autoload.st	Fri Apr 24 06:44:03 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libbasic' }"
 
+"{ NameSpace: Smalltalk }"
+
 nil subclass:#Autoload
 	instanceVariableNames:''
 	classVariableNames:'LazyLoading AutoloadFailedSignal LoadedClasses InProgressClasses'
@@ -353,26 +357,29 @@
     ].
 
     packageID := self package.
-
-    "if there is a package-definition, make sure it is loaded first"
-    packageDefinitionClass := ProjectDefinition definitionClassForPackage: packageID.
-    (packageDefinitionClass notNil) ifTrue:[
-        (packageDefinitionClass ~~ self) ifTrue:[
-            (packageDefinitionClass isBehavior) ifTrue:[
-                (packageDefinitionClass isLoaded) ifFalse:[
-                    packageDefinitionClass autoload.
+    packageID == PackageId noProjectID ifTrue:[
+        Transcript showCR:('Autoload [warning]: bad packageID (__NoProject__) in ', myName); endEntry.
+    ] ifFalse:[
+        "if there is a package-definition, make sure it is loaded first"
+        packageDefinitionClass := ProjectDefinition definitionClassForPackage: packageID.
+        (packageDefinitionClass notNil) ifTrue:[
+            (packageDefinitionClass ~~ self) ifTrue:[
+                (packageDefinitionClass isBehavior) ifTrue:[
+                    (packageDefinitionClass isLoaded) ifFalse:[
+                        packageDefinitionClass autoload.
+                    ].
+                    "/ make sure that my package's extensions are also present
+                    (packageDefinitionClass isLoaded) ifTrue:[
+                        packageDefinitionClass loadExtensions    
+                    ]
                 ].
-                "/ make sure that my package's extensions are also present
-                (packageDefinitionClass isLoaded) ifTrue:[
-                    packageDefinitionClass loadExtensions    
-                ]
             ].
-        ].
-    ] ifFalse:[
-        "/ no package definition class - look for extensions anyway
-        packageExtensionsFile := (Smalltalk projectDirectoryForPackage:packageID) asFilename / 'extensions.st'.
-        packageExtensionsFile exists ifTrue:[
-            packageExtensionsFile fileIn.
+        ] ifFalse:[
+            "/ no package definition class - look for extensions anyway
+            packageExtensionsFile := (Smalltalk projectDirectoryForPackage:packageID) asFilename / 'extensions.st'.
+            packageExtensionsFile exists ifTrue:[
+                packageExtensionsFile fileIn.
+            ].
         ].
     ].
 
@@ -840,11 +847,11 @@
 !Autoload class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.169 2014-11-26 09:08:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.170 2015-04-24 00:50:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.169 2014-11-26 09:08:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.170 2015-04-24 00:50:56 cg Exp $'
 ! !