Error message fix + minor code tweak

Actually, I think the old wording is more accurate. This is about ensuring that we don't go out to the API for stuff that we should have in storage.