If there is only one choice, return it immediately.
  Updated to refactor the handling when no-message was
 specified.
  Fixed typo in vector name - broke the build.