Cope with lock-handoff situation described in #138.