Improve error message

Change-Id: Ib016fea21502b7d908d70567ac4cf512177c01b1