I think it should throw an exception instead of returning a new ModelNode for this case. However, I'm not fully aware of the CLI classes. I'll ask Stan or Alexey to take a look.