Do not recurse when old locking is in effect
Improve error detection and logging