Fixed potential NPE with dates