Add catches for exceptions during upload [Finishes #58390740]