Improve error handling a bit, and fix upgrade for some (unsupported or
broken) targets.