BUG-2043: Hosttracker gives a NPE.

Change-Id: Iecb04ffb18fe77d2d13a0b1299f195649fabc367
Signed-off-by: André Martins <aanm90@gmail.com>
Merge "BUG-2043: Hosttracker gives a NPE."