Wip client flock

"delete NULL;" works fine, no need for this check in future.