SSP-1617 - Graceful degradation for a couple of instances where external
data references cannot be resolved