Fix/2.6/fail cmds with bad options