Simplify this by moving the unlocking out of the error
paths into the exit path.
Signed-off-by: Dave Jones <davej@codemonkey.org.uk>