Revert "Catch upgrade error"

This reverts commit 7e93ffb1af685a0fa9232027c707b08477d63858.