--- a/SmalltalkCodeGeneratorTool.st	Thu Jul 03 20:38:18 2014 +0200
+++ b/SmalltalkCodeGeneratorTool.st	Thu Jul 03 20:46:22 2014 +0200
@@ -2408,17 +2408,18 @@
     cOption := helpOption := false.
 
     (GetOpt new)
-        at:$a
-            put:[:opt :arg | aArgs add:arg];
-        at:$b
-            put:[:opt :arg | bArgs add:arg];
-        at:$b
-            put:[:opt | cOption := true];
+"/        at:$a
+"/            put:[:opt :arg | aArgs add:arg];
+"/        at:$b
+"/            put:[:opt :arg | bArgs add:arg];
+"/        at:$b
+"/            put:[:opt | cOption := true];
         at:$h
             put:[:opt | helpOption := true];
         at:$? 
             put:[:arg | self usage. Smalltalk exit:0];
         default:[:arg | fileArgs add:arg];
+        onError:[:msg | Stderr nextPutLine:msg. self usage];
         parse:argv.
 
     helpOption ifTrue:[ 
@@ -2461,6 +2462,8 @@
 'usage
     Stderr nextPutLine:''usage: '',self applicationName,'' [options...]''.
     Stderr nextPutLine:''  -h .................. output this message''.
+
+    Smalltalk isStandAloneApp ifTrue:[ Smalltalk exit:1 ].
 '.
 
     "Created: / 19-08-2011 / 02:22:46 / cg"
@@ -2665,14 +2668,14 @@
 !SmalltalkCodeGeneratorTool class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.26 2014-05-27 08:23:17 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.27 2014-07-03 18:46:22 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.26 2014-05-27 08:23:17 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SmalltalkCodeGeneratorTool.st,v 1.27 2014-07-03 18:46:22 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: SmalltalkCodeGeneratorTool.st,v 1.26 2014-05-27 08:23:17 stefan Exp $'
+    ^ '$Id: SmalltalkCodeGeneratorTool.st,v 1.27 2014-07-03 18:46:22 cg Exp $'
 ! !