Prevent missing hostname or domain from causing error
Merge pull request #1 from ElephantVentures/bs-fix

Prevent missing hostname or domain from causing error