More new-style container references
Some actual error checking