Improve error messages for csrg/srg mapping file parsing