Adding diagnostics for store errors.