Better error when upgrade fails

Fix for an issue I ran into, this just makes it more specific what went wrong when upgrades fail.