[TAC-156] some defensive code on container and node matrix