Enhance api messages for bad wbeditentity data

Change-Id: I824b157101d32eb44d56ea61c9590b9f7a401bd3