Fixed another time zone issue
Fixed a NPE in a very bad way