Possible crash fix

Jira Issue: WP-1264
Bug stopping PZH-PZP sync

Jira Issue: WP-1264