Merge "Handle missing spanloss in PCE without crashing"