Tighten type check in domain (closes #15)
Merge pull request #37 from gurneyalex/7.0

Tighten type check in domain (closes #15)