improved error message

Change-Id: I4ba3568dfc78b6443532b62bb425d06d690974f4