Add check for empty domain
Merge pull request #157 from jerv13/master

Add check for empty domain