Bug 896364 - Minor cleanup.

Make the error strings consistent so we can use them as a hint to the broker.