diff --git a/orcid-core/src/main/java/org/orcid/core/adapter/impl/MapperFacadeFactory.java b/orcid-core/src/main/java/org/orcid/core/adapter/impl/MapperFacadeFactory.java
index de571bd1213..a68bf4f3b55 100644
--- a/orcid-core/src/main/java/org/orcid/core/adapter/impl/MapperFacadeFactory.java
+++ b/orcid-core/src/main/java/org/orcid/core/adapter/impl/MapperFacadeFactory.java
@@ -943,7 +943,9 @@ public void mapAtoB(PeerReview a, PeerReviewEntity b, MappingContext context) {
                 if(WorkType.DISSERTATION.equals(a.getSubjectType())) {
                     b.setSubjectType(org.orcid.jaxb.model.common.WorkType.DISSERTATION_THESIS.name());
                 } else {
-                    b.setSubjectType(a.getSubjectType().name());
+                    if(a.getSubjectType() != null) {
+                        b.setSubjectType(a.getSubjectType().name());
+                    }
                 }
             }
         });