diff --git a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java
index c40ddc044..6cc8446c8 100644
--- a/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java
+++ b/src/main/java/org/breedinginsight/brapi/v2/services/BrAPIGermplasmService.java
@@ -135,8 +135,12 @@ public List<Map<String, Object>> processData(List<BrAPIGermplasm> germplasm){
 
             if ((germplasmEntry.getPedigree() != null) && (!germplasmEntry.getPedigree().isEmpty())) {
                 Pedigree germPedigree = Pedigree.parsePedigreeString(germplasmEntry.getPedigree());
-                row.put("Female Parent GID", Integer.parseInt(germPedigree.femaleParent));
-                if (!germPedigree.maleParent.isEmpty()) row.put("Male Parent GID", Integer.parseInt(germPedigree.maleParent));
+                if (!germPedigree.maleParent.isEmpty()) {
+                    row.put("Male Parent GID", Integer.parseInt(germPedigree.maleParent));
+                }
+                if (!germPedigree.femaleParent.isEmpty()) {
+                    row.put("Female Parent GID", Integer.parseInt(germPedigree.femaleParent));
+                }
             }
 
             // Synonyms