fix null lock