Fix problem with --help param

Change-Id: If4badd49bc14f58b93862a10469739726e6d87a7