Catch some more invalid IDs when linking records