cmds2/add: return correct error
cmds2/add: temp fix for -r. horrible hack

This will be removed soon, just gets us past landing cmds2.