Better diagnostics.