[#1004] - Suraj/Samiksha - validation on input.