#503 - Incorrectly using new GregorianCalendar instead of SystemTime, possible NPE