Add upgrade-related error
Add more specfic errors relating channel recvery