Better locking & unlocking

Improve locking mechanism

Unlock will no longer fail when lock files are deleted during
processing message queue.