Guard against missing registered/claimed fields