Got rid of MWException in Entity

Change-Id: I4d105d11cd20e152da67ac808b3cd2d1e25732db
Merge "Got rid of MWException in Entity"