Merge "Add null check for call handle" into pi-dev