SSP-2324 Guard against missing terms