NPE on check with only one entry fixed and time formatter improved