#12 avoided holding a reference to a bad host
Merge pull request #35 from adamralph/12

#12 avoided holding a reference to a bad host