Merge pull request #10 from dang/lock-order

Fix coverity 131560