More tweaks to the nice-errors-in-uncached-code-path fix.