Prevent total failure of WhatLinksHere hook

Change-Id: I0df1935a6cd772e094838eca9b03bfcc136042f1
Merge "Prevent total failure of WhatLinksHere hook"