Fixed null host issue