--- a/SourceCodeManagerUtilities.st	Wed Mar 27 20:51:41 2013 +0100
+++ b/SourceCodeManagerUtilities.st	Thu Mar 28 11:48:26 2013 +0100
@@ -905,15 +905,15 @@
 !
 
 validateConsistencyOfPackage:aPackage doClasses:doClasses doExtensions:doExtensions
-    |checker defClass report msg answer dialog|
-
-    defClass := aPackage asPackageId projectDefinitionClass.
-    "/ also done by ProjectChecker
+    |checker report msg answer dialog|
+
+    "/ also done by ProjectChecker...
+    "/ defClass := aPackage asPackageId projectDefinitionClass.
     "/ defClass validateDescription.
 
     checker := ProjectChecker new.
     checker checkExtensionsOnly:(doClasses not and:[ doExtensions ]).
-    report := checker check: defClass package.
+    report := checker check: aPackage.
     (report notNil and:[report problems notEmptyOrNil]) ifTrue:[
         report problems size == 1 ifTrue:[
             msg := 'The ProblemChecker found the following error/inconsistency:\\    %2\\Need more detail or help for repair?'
@@ -929,11 +929,11 @@
         answer == true ifTrue:[
             dialog := Tools::ProjectCheckerBrowser new.
             dialog
-                projectChecker: (ProjectChecker forPackage: defClass package);
+                projectChecker: (ProjectChecker forPackage: aPackage);
                 problemList:report problems;
                 showCancel:true;
                 openModal.
-self halt.
+
             dialog accepted ifFalse:[
                 AbortSignal raiseRequest
             ].
@@ -2427,14 +2427,15 @@
     aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
     aClass package:requiredPackage.
 
-    (mgr
+    [ mgr
         createContainerFor:aClass
         inModule:module
         package:directory
         container:fileName
-    ) ifFalse:[
-        self warn:(resources string:'Failed to create container.').
-        ^ false.
+    ] whileFalse:[
+        (Dialog confirm:(resources stringWithCRs:'Failed to create container.\(fix your setup then retry, or cancel)\\Retry?') yesLabel:'Retry') ifFalse:[
+            ^ false.
+        ].
     ].
     ^ true
 
@@ -3890,10 +3891,10 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.268 2013-03-27 19:36:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.269 2013-03-28 10:48:26 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.268 2013-03-27 19:36:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.269 2013-03-28 10:48:26 cg Exp $'
 ! !