Clean up the codes to move the release handles into fail labels.

v2: squash in Christian's regression fix
Signed-off-by: NHuang Rui <ray.huang@amd.com>
Reviewed-by: NChunming Zhou <david1.zhou@amd.com>
Reviewed-by: NChristian König <christian.koenig@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>