Provide proper error message

Change-Id: I34825faf06f21fed6dfb97ba2a2f78b36d0e356f