diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
index 918a9929b1..de06d147b1 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToListContainerOptions.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import org.jclouds.blobstore.options.ListContainerOptions;
 
 import com.google.common.base.Function;
+import com.google.common.base.Strings;
 
 public class ToListContainerOptions implements
       Function<ListContainerOptions, org.jclouds.openstack.swift.v1.options.ListContainerOptions> {
@@ -45,7 +46,7 @@ public class ToListContainerOptions implements
       } else if (!from.isRecursive()) {
          options.delimiter('/');
       }
-      if (from.getDelimiter() != null) {
+      if (!Strings.isNullOrEmpty(from.getDelimiter())) {
          if (from.getDelimiter().length() != 1) {
             throw new IllegalArgumentException("Delimiter must be a single character");
          }