Improved host checking