diff --git a/misc-scripts/xref_mapping/XrefParser/RefSeqGPFFParser.pm b/misc-scripts/xref_mapping/XrefParser/RefSeqGPFFParser.pm
index 0ed0a05500cc565da0632d3d001203cae648802b..3a6c5b6bcad9bef83649ae7f33c19a99ab406a1a 100644
--- a/misc-scripts/xref_mapping/XrefParser/RefSeqGPFFParser.pm
+++ b/misc-scripts/xref_mapping/XrefParser/RefSeqGPFFParser.pm
@@ -55,8 +55,8 @@ sub run {
       . "$pred_peptide_source_id\n";
     print "RefSeq_dna_predicted source ID = $pred_dna_source_id\n";
 
+    my @xrefs;
     foreach my $file (@files) {
-
         if ( $source_id < 1 ) {
             $source_id =
               $self->get_source_id_for_filename( basename($file) );
@@ -65,7 +65,7 @@ sub run {
             $species_id = $self->get_species_id_for_filename($file);
         }
 
-        my $xrefs =
+        push @xrefs,
           $self->create_xrefs( $peptide_source_id,
                                $dna_source_id,
                                $pred_peptide_source_id,
@@ -73,13 +73,16 @@ sub run {
                                $file,
                                $species_id );
 
-        if ( !defined($xrefs) ) {
+        if ( !defined( $xrefs[-1] ) ) {
             return 1;    #error
         }
+    }
+
+    foreach my $xrefs (@xrefs) {
         if ( !defined( $self->upload_xref_object_graphs($xrefs) ) ) {
             return 1;    # error
         }
-    } ## end foreach my $file (@files)
+    }
 
     if ( defined $release_file ) {
         # Parse and set release info.
diff --git a/misc-scripts/xref_mapping/XrefParser/RefSeqParser.pm b/misc-scripts/xref_mapping/XrefParser/RefSeqParser.pm
index 1a69e58c84cc05e9441f53908c134d8755adf9fe..da291de600fc72802271ca62e7ce874af4af76cd 100644
--- a/misc-scripts/xref_mapping/XrefParser/RefSeqParser.pm
+++ b/misc-scripts/xref_mapping/XrefParser/RefSeqParser.pm
@@ -55,12 +55,13 @@ sub run {
       . "$pred_peptide_source_id\n";
     print "RefSeq_dna_predicted source ID = $pred_dna_source_id\n";
 
+    my @xrefs;
     foreach my $file (@files) {
         if ( !defined($species_id) ) {
             $species_id = $self->get_species_id_for_filename($file);
         }
 
-        my $xrefs =
+        push @xrefs,
           $self->create_xrefs( $peptide_source_id,
                                $dna_source_id,
                                $pred_peptide_source_id,
@@ -68,9 +69,12 @@ sub run {
                                $file,
                                $species_id );
 
-        if ( !defined($xrefs) ) {
+        if ( !defined($xrefs[-1]) ) {
             return 1;    #error
         }
+    }
+
+    foreach my $xrefs (@xrefs) {
         if ( !defined( $self->upload_xref_object_graphs($xrefs) ) ) {
             return 1;    # error
         }