mod. simplify _create_lock, more logging.

Change-Id: Ie9aa97a3d9487ca34583c1f9b23cb9629fdf17b3