Clean up error handling within promise
Upgrade