--- a/Tools__ProjectBuilderAssistantApplication.st	Fri Sep 21 11:23:43 2012 +0200
+++ b/Tools__ProjectBuilderAssistantApplication.st	Wed Sep 26 21:00:43 2012 +0200
@@ -1741,7 +1741,10 @@
 doClearBuildDirectory
     <resource: #uiCallback>
 
-    projectBuilder packageBuildDirectory asFilename recursiveRemove
+    projectBuilder isNil ifTrue:[ self getProjectBuilder ].
+    projectBuilder buildDirectory notNil ifTrue:[   
+        projectBuilder packageBuildDirectory asFilename recursiveRemove
+    ].
 
     "Created: / 05-09-2012 / 10:35:54 / cg"
 !
@@ -1871,6 +1874,15 @@
     "Created: / 04-09-2012 / 09:52:32 / cg"
 !
 
+getProjectBuilder
+    projectBuilder := ProjectBuilder new.
+    projectBuilder package:(selectedProjectDefinition package).
+    projectBuilder usedCompilerForBuild:(usedCompilerHolder value).
+    ^ projectBuilder
+
+    "Created: / 26-09-2012 / 20:57:32 / cg"
+!
+
 projectTypeChanged
     <resource: #uiCallback>
 
@@ -1892,10 +1904,7 @@
         ].
         ex proceed.
     ] do:[
-        projectBuilder := ProjectBuilder new.
-        projectBuilder package:(selectedProjectDefinition package).
-        projectBuilder usedCompilerForBuild:(usedCompilerHolder value).
-        projectBuilder makeExeOnly:(what = 'exe').
+        self getProjectBuilder.
 
         Error handle:[:ex |
             makeOutputWindow endEntry.
@@ -1908,7 +1917,7 @@
         ].
     ].
 
-    "Modified: / 08-09-2012 / 20:18:50 / cg"
+    "Modified: / 26-09-2012 / 20:57:42 / cg"
 !
 
 selectedApplicationChanged