diff --git a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
index a97286c5e4..9f2edbaaac 100644
--- a/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
+++ b/contrib/hadoop-store-builder/src/java/voldemort/store/readonly/fetcher/HdfsFetcher.java
@@ -495,12 +495,18 @@ public void setAsyncOperationStatus(AsyncOperationStatus status) {
      * Main method for testing fetching
      */
     public static void main(String[] args) throws Exception {
-        if(args.length != 1)
+        if(args.length < 1)
             Utils.croak("USAGE: java " + HdfsFetcher.class.getName()
                         + " url [keytab location] [kerberos username]");
         String url = args[0];
-        String keytabLocation = args[1];
-        String proxyUser = args[2];
+
+        String keytabLocation = "";
+        String proxyUser = "";
+        if(args.length >= 3) {
+            keytabLocation = args[1];
+            proxyUser = args[2];
+        }
+
         long maxBytesPerSec = 1024 * 1024 * 1024;
         Path p = new Path(url);