New Coverity release found a couple of error paths where memory would be
leaked in an error/goto path before being properly handled.