Better error message

Change-Id: Ie2216bc65a62ac514926471481d7b324a68ff633