Main upgrade path fix for the no-upgrade code path and error reporting additions