Improve error message about wrong proxy admin when 0x0

I'm trying to follow the instructions for using the upgrades plugin for hardhat. I have the exact same scripts (except with my contract instead of Box) shown here: https://docs.openzeppelin.com/upgrades-plugins/1.x/hardhat-upgrades#script-usage

If I deploy in the first script, then use the address from that script's log in the upgrade script, I get the following error:

$ hh run scripts/deploy.js 
Implementation V1 deployed to: 0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0
$ hh run scripts/upgrade.js 
Error: Proxy admin is not the one registered in the network manifest
    at Proxy.upgradeProxy (/work/hardhat-test/node_modules/@openzeppelin/hardhat-upgrades/src/upgrade-proxy.ts:79:13)

If I combine the initial deploy and the upgrade in the same script it works fine (similar to the Usage in Tests section at the bottom of the page).

This only happens when using the default hardhat network VM. If I connect to a local network (ganache), the upgrade works fine.

Any help would be appreciated. Thanks!

Start with the reported stack location in src/upgrade-proxy.ts at line 79 and compare behavior between the default Hardhat network VM and a local Ganache network. Reproduce the separate deploy.js and upgrade.js runs using the linked Hardhat Upgrades documentation, then confirm that the proxy admin is resolved consistently and that the upgrade succeeds across both network setups.