Add logging to safe unlock/lock?