Don't continue after invalid options with specific commands.

When a command needs option parsing, and an invalid option was
specified, don't continue but exit instead (like one would expect it...)

(cherry picked from commit 23215b6d43d4a0606c65d30b2d8ab05f92e2c153)