From f45937ca67d06c61fad70b426145e016e3789abd Mon Sep 17 00:00:00 2001
From: "Niels Erik G. Nielsen" <nielserik@indexdata.com>
Date: Wed, 3 Jul 2013 07:25:01 -0400
Subject: [PATCH] Fixes npe when no subjects in location

---
 .../java/com/indexdata/mkjsf/pazpar2/data/Location.java  |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/data/Location.java b/src/main/java/com/indexdata/mkjsf/pazpar2/data/Location.java
index 8cbfb90..57e72a6 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/data/Location.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/data/Location.java
@@ -40,12 +40,14 @@ public class Location extends ResponseDataObject {
   
   public String getSubjects() {
     StringBuilder builder = new StringBuilder("");
-    for (ResponseDataObject data : getElements("md-subject")) {
-      if (builder.length()==0) {
-        builder.append(data.getValue());
-      } else {
-        builder.append(", ");
-        builder.append(data.getValue());
+    if (getElements("md-subject") != null) {
+      for (ResponseDataObject data : getElements("md-subject")) {
+        if (builder.length()==0) {
+          builder.append(data.getValue());
+        } else {
+          builder.append(", ");
+          builder.append(data.getValue());
+        }
       }
     }
     return builder.toString();
-- 
1.7.10.4