Missed an unlock condition,  lets use a finally.  Should Fix #2180