Comment by webstrand

Very nice, using the goto trick to perform cleanups always felt dirty to me.