Fix validateLock being called more than once
Merge pull request #93 from bancek/upstream

Fix validateLock being called more than once