Dev/issue 6596 aip restore v3

Okay! This'll raise when the `.get` occurs, which would be confusing/inconvenient, so it seems like it'd make sense to avoid the multiple locations happening in the first place.