hpsa: clean up error handling