Merge pull request #12775 from nickberry17/add_mm_err_messages