killbill-memoizeit

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
index cea1612..da2605d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
@@ -258,7 +258,10 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
 
                 generator.writeStartArray();
                 for (final E entity : entities) {
-                    generator.writeObject(toJson.apply(entity));
+                    final J asJson = toJson.apply(entity);
+                    if (asJson != null) {
+                        generator.writeObject(asJson);
+                    }
                 }
                 generator.writeEndArray();
                 generator.close();

diff --git a/pom.xml b/pom.xml
index 930442a..bdb5d9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.7.14</version>
+        <version>0.7.15-SNAPSHOT</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.11.6-SNAPSHOT</version>