diff --git a/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java b/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java
index 0dd878c7aad..8acc43a7585 100644
--- a/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java
+++ b/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java
@@ -20,6 +20,7 @@
 package com.metamx.druid.query;
 
 import com.google.common.base.Function;
+import com.google.common.base.Predicates;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -76,7 +77,7 @@ public class ChainedExecutionQueryRunner<T> implements QueryRunner<T>
   {
     this.exec = exec;
     this.ordering = ordering;
-    this.queryables = Iterables.unmodifiableIterable(queryables);
+    this.queryables = Iterables.unmodifiableIterable(Iterables.filter(queryables, Predicates.notNull()));
   }
 
   @Override
diff --git a/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java
index f4e2265745c..55900394860 100644
--- a/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java
+++ b/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java
@@ -41,7 +41,7 @@ public class CountAggregatorFactory implements AggregatorFactory
       @JsonProperty("name") String name
   )
   {
-    Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
+    Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
 
     this.name = name;
   }
diff --git a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java
index 0f47561d1d7..ec89a79f39d 100644
--- a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java
+++ b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java
@@ -45,8 +45,8 @@ public class DoubleSumAggregatorFactory implements AggregatorFactory
       @JsonProperty("fieldName") final String fieldName
   )
   {
-    Preconditions.checkNotNull(name, "Must have a valid, nonl null aggregator name");
-    Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
+    Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
+    Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
 
     this.name = name;
     this.fieldName = fieldName;
diff --git a/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java
index 5bc4a40a420..6c65cd95f28 100644
--- a/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java
+++ b/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java
@@ -51,8 +51,8 @@ public class HistogramAggregatorFactory implements AggregatorFactory
       @JsonProperty("breaks") final List<Float> breaksList
   )
   {
-    Preconditions.checkNotNull(name, "Must have a valid, nonl null aggregator name");
-    Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
+    Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
+    Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
 
     this.name = name;
     this.fieldName = fieldName;
diff --git a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java
index 7e4c1a66c6a..a8375f294fa 100644
--- a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java
+++ b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java
@@ -63,11 +63,11 @@ public class JavaScriptAggregatorFactory implements AggregatorFactory
       @JsonProperty("fnCombine") final String fnCombine
   )
   {
-    Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
-    Preconditions.checkNotNull(fieldNames, "Must have a valid, non null fieldNames");
-    Preconditions.checkNotNull(fnAggregate, "Must have a valid, non null fnAggregate");
-    Preconditions.checkNotNull(fnReset, "Must have a valid, non null fnReset");
-    Preconditions.checkNotNull(fnCombine, "Must have a valid, non null fnCombine");
+    Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
+    Preconditions.checkNotNull(fieldNames, "Must have a valid, non-null fieldNames");
+    Preconditions.checkNotNull(fnAggregate, "Must have a valid, non-null fnAggregate");
+    Preconditions.checkNotNull(fnReset, "Must have a valid, non-null fnReset");
+    Preconditions.checkNotNull(fnCombine, "Must have a valid, non-null fnCombine");
 
     this.name = name;
     this.fieldNames = fieldNames;
diff --git a/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java
index 1aeb5e6471d..07e04254f76 100644
--- a/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java
+++ b/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java
@@ -45,8 +45,8 @@ public class LongSumAggregatorFactory implements AggregatorFactory
       @JsonProperty("fieldName") final String fieldName
   )
   {
-    Preconditions.checkNotNull(name, "Must have a valid, nonl null aggregator name");
-    Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
+    Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
+    Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
 
     this.name = name;
     this.fieldName = fieldName;
diff --git a/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java
index dda25b355d7..45cd85257f7 100644
--- a/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java
+++ b/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java
@@ -45,8 +45,8 @@ public class MaxAggregatorFactory implements AggregatorFactory
       @JsonProperty("fieldName") final String fieldName
   )
   {
-    Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
-    Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
+    Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
+    Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
 
     this.name = name;
     this.fieldName = fieldName;
diff --git a/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java
index 5b92072be07..a6d19ebd8e5 100644
--- a/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java
+++ b/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java
@@ -45,8 +45,8 @@ public class MinAggregatorFactory implements AggregatorFactory
       @JsonProperty("fieldName") final String fieldName
   )
   {
-    Preconditions.checkNotNull(name, "Must have a valid, non null aggregator name");
-    Preconditions.checkNotNull(fieldName, "Must have a valid, non null fieldName");
+    Preconditions.checkNotNull(name, "Must have a valid, non-null aggregator name");
+    Preconditions.checkNotNull(fieldName, "Must have a valid, non-null fieldName");
 
     this.name = name;
     this.fieldName = fieldName;
diff --git a/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusherConfig.java b/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusherConfig.java
index c3f6d603ccb..b27d03672bc 100644
--- a/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusherConfig.java
+++ b/server/src/main/java/com/metamx/druid/loading/HdfsDataSegmentPusherConfig.java
@@ -21,12 +21,10 @@ package com.metamx.druid.loading;
 
 import org.skife.config.Config;
 
-import java.io.File;
-
 /**
  */
 public abstract class HdfsDataSegmentPusherConfig
 {
   @Config("druid.pusher.hdfs.storageDirectory")
-  public abstract File getStorageDirectory();
+  public abstract String getStorageDirectory();
 }
diff --git a/server/src/main/java/com/metamx/druid/master/DruidMaster.java b/server/src/main/java/com/metamx/druid/master/DruidMaster.java
index 13fe5a58c1e..36b0b0b1596 100644
--- a/server/src/main/java/com/metamx/druid/master/DruidMaster.java
+++ b/server/src/main/java/com/metamx/druid/master/DruidMaster.java
@@ -668,7 +668,7 @@ public class DruidMaster
         synchronized (lock) {
           final LeaderLatch latch = leaderLatch.get();
           if (latch == null || !latch.hasLeadership()) {
-            log.info("[%s] is master, not me.  Phooey.", latch == null ? null : latch.getLeader().getId());
+            log.info("LEGGO MY EGGO. [%s] is master.", latch == null ? null : latch.getLeader().getId());
             stopBeingMaster();
             return;
           }