Updated locks & cv's to assert non-null parameters