Add another null check in TubeLogic