Fix one error message, remove another bogus one.

Change-Id: Ibc2a41e14c0b8544cbfe9f98f9550b5c70476d95