Fix: Validation was not done properly, and storing empty string.