diff --git a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java
index 98781a1798..e4c885a101 100644
--- a/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java
+++ b/openstack-poppy/src/main/java/org/jclouds/openstack/poppy/v1/domain/CreateService.java
@@ -185,8 +185,8 @@ public CreateService build() {
                this.name,
                this.domains,
                this.origins,
-               ImmutableList.copyOf(this.caching),
-               ImmutableList.copyOf(this.restrictions),
+               this.caching == null ? null : ImmutableList.copyOf(this.caching),
+               this.restrictions == null ? null : ImmutableList.copyOf(this.restrictions),
                this.flavorId);
          return result;
       }