Make sure to unlock if container exists