This should make the operator a bit more robust after initial production testing @manifoldco.

This should also include validation.