Fix/2.7/fail cmds with bad options