More infomative errors in wbeditentity

Change-Id: Ibd08e6213fb635f5f6223a0810ef0d1c8800ea64