uxc: clean up error handling