Added more validations for null date