Fix some ancient and incorrect error handling code
Fix some ancient and incorrect error handling code

kyledrake/puma,ngpestelos/puma,ngpestelos/puma,ngpestelos/puma,wallclockbuilder/puma,eileencodes/puma,unleashed/puma,BenV/puma,zapnap/puma,looker/puma,wallclockbuilder/puma,unleashed/puma,respire/puma,nathansamson/puma,looker/puma,nathansamson/puma,BenV/puma,puma/puma,puma/puma,prathamesh-sonpatki/puma,puma/puma,wallclockbuilder/puma,looker/puma,snow/puma,jbmyid/puma,snow/puma,kyledrake/puma,zBMNForks/puma,prathamesh-sonpatki/puma,unleashed/puma,zBMNForks/puma,looker/puma,snow/puma,jbmyid/puma,nathansamson/puma,ngpestelos/puma,eileencodes/puma,prathamesh-sonpatki/puma,eileencodes/puma,nathansamson/puma,respire/puma,zapnap/puma,kyledrake/puma,BenV/puma,respire/puma,snow/puma,jbmyid/puma,zapnap/puma,respire/puma,zBMNForks/puma,unleashed/puma,kyledrake/puma,wallclockbuilder/puma,zapnap/puma,zBMNForks/puma,jbmyid/puma,puma/puma,eileencodes/puma,prathamesh-sonpatki/puma,BenV/puma