Fix issue where multiword subjects not found
Raise error when subject not found