BLK-98 No need for a lock since there's only one thread. Fixes logic errors

Signed-off-by: Oren Leiman <oleiman@neutral.io>