Include filename in MSAError when relevant.