Add another null check to tube logic