Return short in LinkBeginHookHandler if not entity namespace

Change-Id: I720327f15fd4020781548006aea213e1c77b9dcc