  
      print 'Done.'
  
-@@ -493,6 +496,7 @@ def start(bundle_name=None):
+@@ -463,8 +473,9 @@ def cmd_build(config, args):
+     '''Build generated files'''
+ 
+     if args:
++        print 'ERROR - Wrong argument.'
+         print 'Usage: %prog build'
+-        return
++        exit (1)
+ 
+     builder = Builder(config)
+     builder.build()
+@@ -492,7 +503,9 @@ def start(bundle_name=None):
+     try:
          globals()['cmd_' + args[0]](config, args[1:])
      except (KeyError, IndexError):
++        print 'ERROR - Wrong command or argument.'
          print_commands()
 +        exit (1)
  

             self.fix_manifest()
             files = self.config.bundle.get_files()
 
@@ -272,6 +273,7 @@ def cmd_dev(config, args):
             print 'ERROR - The bundle has been already setup for development.'
         else:
             print 'ERROR - A bundle with the same name is already installed.'

 
     print 'Bumping activity version...'
 
@@ -440,22 +450,22 @@ def cmd_release(config, args):
     retcode = subprocess.call(['git', 'commit', '-a', '-m % s' % changelog])
     if retcode:
         print 'ERROR - cannot commit to git'
