Bug fix: date picker deals with null dates