I'm unsure what the fix for the tool would look like. We only have one case where these two cases are encountered (`create-policy`), and that command requires that several references exist already.