More accurate checks for device discovering