Fixes lock being set on premature returns.
Merge pull request #3357 from sergii-tkachenko/ds-user-drush-remove-lock

Fixes lock being set on premature returns.