Make the resolver better able to handle unexpected record types. Also check for