Added more validation for the name and description

Reviewer : Dan V (post commit)

Issue: None