In the wake of r7415, let's have some better error reporting.