Small refactoring
Permit xref-checks to fail without returning 404