Added check for null dates. Will be picked up by required validator.