Merge "Fix NPE on ShutdownCheckPoints"