Add function for ensuring that a treatment exists.
Merge branch 'ensure-treatment' into devel