Fixed NPE on time limit checks