add guards for non-existent treatment, and tests