fix NPE issue
Reviewer: Joyce Avestro
Issue: GCP-8879