killbill-memoizeit

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java
index 8f6c71b..c2979f3 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/PaymentMethodJson.java
@@ -107,9 +107,12 @@ public class PaymentMethodJson {
                     }
                     @Override
                     public List<PaymentMethodKVInfo> getProperties() {
-                        List<PaymentMethodKVInfo> result = new LinkedList<PaymentMethodPlugin.PaymentMethodKVInfo>();
-                        for (PaymentMethodProperties cur : pluginInfo.getProperties()) {
-                            result.add(new PaymentMethodKVInfo(cur.getKey(), cur.getValue(), cur.isUpdatable));
+                        if (pluginInfo.getProperties() != null) {
+                            List<PaymentMethodKVInfo> result = new LinkedList<PaymentMethodPlugin.PaymentMethodKVInfo>();
+                            for (PaymentMethodProperties cur : pluginInfo.getProperties()) {
+                                result.add(new PaymentMethodKVInfo(cur.getKey(), cur.getValue(), cur.isUpdatable));
+                            }
+                            return result;
                         }
                         return null;
                     }