Improved error handling when upgrading content.