Shouldn't exit with 1 for version or help options.
Shouldn't exit with 1 for version or help options.

(cherry picked from commit c41b632caf9d87379eb07302d1d47a553623b8a1)

mttbernardini/mbc,mttbernardini/mbc