Less obtuse error messages

Change-Id: I3d6eeba7c0ceccacb8ab31a35c977cdda02393d6