Express safety-lock

As requested.