diff --git a/src/com/oltpbenchmark/CommandLineOptions.java b/src/com/oltpbenchmark/CommandLineOptions.java
index 2f24b6e..ae428f5 100644
--- a/src/com/oltpbenchmark/CommandLineOptions.java
+++ b/src/com/oltpbenchmark/CommandLineOptions.java
@@ -44,7 +44,7 @@ public class CommandLineOptions {
                 "gpc",
                 "geopartitioned-config",
                 true,
-                "GeoPartitioning configuration file [default: config/geopartitioned_workload.xml]");
+                "GeoPartitioning configuration file");
 
         COMMAND_LINE_OPTS.addOption("im", "interval-monitor", true,
                 "Throughput Monitoring Interval in milliseconds");
diff --git a/src/com/oltpbenchmark/DBWorkload.java b/src/com/oltpbenchmark/DBWorkload.java
index 5dd26d8..9da8eab 100644
--- a/src/com/oltpbenchmark/DBWorkload.java
+++ b/src/com/oltpbenchmark/DBWorkload.java
@@ -136,11 +136,14 @@ public static void main(String[] args) throws Exception {
       // BEGIN LOADING WORKLOAD CONFIGURATION
       // ----------------------------------------------------------------
 
-      String geopartitionedConfigFile = options.getGeoPartitionedConfigFile().orElse("config/geopartitioned_workload.xml");
-      GeoPartitionedConfigFileOptions geopartitionedConfigOptions = new GeoPartitionedConfigFileOptions(geopartitionedConfigFile);
-      GeoPartitionPolicy geoPartitionPolicy = geopartitionedConfigOptions.getGeoPartitionPlacement(totalWarehousesAcrossShards, numWarehouses, startWarehouseIdForShard);
-      
+      String geopartitionedConfigFile = options.getGeoPartitionedConfigFile().orElse("");
+      GeoPartitionPolicy geoPartitionPolicy = null;
+      if (!geopartitionedConfigFile.isEmpty()) {
+          GeoPartitionedConfigFileOptions geopartitionedConfigOptions = new GeoPartitionedConfigFileOptions(geopartitionedConfigFile);
+          geoPartitionPolicy = geopartitionedConfigOptions.getGeoPartitionPlacement(totalWarehousesAcrossShards, numWarehouses, startWarehouseIdForShard);
+      }
       WorkloadConfiguration wrkld = new WorkloadConfiguration(geoPartitionPolicy);
+      
       wrkld.setBenchmarkName(plugin);
 
       // Pull in database configuration