I'd be happier if we checked the full error message here somehow (mostly because we've been bitten by error messages not including the intended information before)..