Avoiding 'pc is undefined' failures
Merge pull request #3861 from yurydelendik/pc-undef

Avoiding 'pc is undefined' failures