Added asserts at point of setting instead of when they get used.