Final fixes
Handling null pointer exception in DateTimeHelper