We're supposed to unlock after the error, given that the lock is just above. Regression from 7dcc370d.