null check

drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java

@@ -143,11 +143,13 @@ public class PlannerService {
 
         Map<String, Object> map = plan.getKeyValue();
         Set<String> ids = plan.getLoweLevelPlanIDs();
-        for (String lowID : ids) {
-            PlanResponse ll = findOne(lowID);
-            Map<String, Object> lowLevelMap = ll.getKeyValue();
-            if (lowLevelMap != null) {
-                map.put(ll.getName(), lowLevelMap);
+        if (ids != null) {
+            for (String lowID : ids) {
+                PlanResponse ll = findOne(lowID);
+                Map<String, Object> lowLevelMap = ll.getKeyValue();
+                if (lowLevelMap != null) {
+                    map.put(ll.getName(), lowLevelMap);
+                }
             }
         }
 

drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/utils/PropertyValues.java

@@ -15,6 +15,7 @@
  */
 package nl.uva.sne.drip.drip.provisioner.utils;
 
+import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.MessageFormat;
@@ -40,7 +41,7 @@ public class PropertyValues {
         PropertyValues.HOST = prop.getProperty("rabbitmq.host", "127.0.0.1");
         PropertyValues.RPC_QUEUE_NAME = prop.getProperty("rpc.queue.name",
                 "provisioner_queue_v1");
-        PropertyValues.TRUSTED_CERTIFICATE_FOLDER = prop.getProperty("trusted.certificates.folder", "/etc/grid-security/certificates");
+        PropertyValues.TRUSTED_CERTIFICATE_FOLDER = prop.getProperty("trusted.certificates.folder", System.getProperty("user.home") + File.separator + ".globus" + File.separator + "certificates");
         CA_BUNDLE_URL = new URL(prop.getProperty("ca.bundle.url",
                 "https://dist.eugridpma.info/distribution/igtf/current/accredited/igtf-preinstalled-bundle-classic.tar.gz"));