GCP-7001 fix for NPE encountered