Fixed null checking logic in kay manager.

2 files changed