Made the change, moved the checking of null to UpdateLastKeepAlive().