Fix TickManager NPE, fix previous Event patch.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>