Failsave method for highlighting

Change-Id: I430a7a1b7a325b5ede5e814d370fcc3171d048f9