CLT-138 add error message for new option and addressed some code review comments