diff --git a/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/review-metadata.jsp b/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/review-metadata.jsp
index cb18a613b6..61acf8bb90 100644
--- a/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/review-metadata.jsp
+++ b/dspace-jspui/dspace-jspui-webapp/src/main/webapp/submit/review-metadata.jsp
@@ -158,7 +158,11 @@
                    String storedVal = values[i].value;
                    String displayVal = inputs[z].getDisplayString(pairsName,
                                                                 storedVal);
-                   row.append(Utils.addEntities(displayVal));
+                   if (displayVal == null || displayVal.equals("")) 
+                   {
+                       // use the stored value as label rather than null
+                       row.append(Utils.addEntities(storedVal));
+                   }
                 }
                 else if (inputType.equals("qualdrop_value"))
                 {
@@ -167,9 +171,9 @@
                    String displayQual = inputs[z].getDisplayString(pairsName, 
                                                                  qual);
                    String displayValue = Utils.addEntities(values[i].value);
-                   if (displayQual != null)
+                   if (displayValue != null)
                    {
-                       row.append(displayQual + ":" + displayValue);
+                       row.append((displayQual == null ? qual : displayQual) + ":" + displayValue);
                    }
                 }
                 else 
diff --git a/dspace/CHANGES b/dspace/CHANGES
index 87e70314a9..3b450d9d5f 100644
--- a/dspace/CHANGES
+++ b/dspace/CHANGES
@@ -31,6 +31,7 @@
  - Fix for SF Bug #1968082 SWORD Service Document fails if Collection is untitled
  - Fix for SF Bug #2493794 Hardcoded Strings in DSQuery
  - Fix for SF Bug #1745573 Itemmap-browse.jsp throws Exception on items without date
+ - Fix for SF Bug #1571645 NullPointerException possible in review.jsp
  
 (Elliot Metsger)
  - Patch for SF bug #2016130 checksum checker can not retrieve very large bitstream