Add NULL condition for CallStar