[PATCH 04/11] Avoid double free on error