[Aux] Defensive programming - additional asserts added.