Merge "BUG-2043: Hosttracker gives a NPE."