AABP 813: Addressing Diagnostic Error

---