Got rid of MWException usage in EntityId

Change-Id: I4c12d92701f273091aba9cbbd86ecbfca14bf609
Merge "Got rid of MWException usage in EntityId"