Discovered during testing of scenarios for GCP-8051 : some scenarios cause a NullPointerException. Adding code to resolve
Merge remote-tracking branch 'origin/master'