refs #9257. Add diagnostics