diff --git a/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java b/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java
index cd21bb777be..ce4f4736450 100644
--- a/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java
+++ b/processing/src/main/java/io/druid/segment/incremental/SpatialDimensionRowTransformer.java
@@ -144,7 +144,12 @@ public class SpatialDimensionRowTransformer implements Function<InputRow, InputR
       @Override
       public long getLongMetric(String metric)
       {
-        return row.getLongMetric(metric);
+        try {
+          return row.getLongMetric(metric);
+        }
+        catch (ParseException e) {
+          throw Throwables.propagate(e);
+        }
       }
 
       @Override
@@ -229,4 +234,4 @@ public class SpatialDimensionRowTransformer implements Function<InputRow, InputR
     }
     return true;
   }
-}
\ No newline at end of file
+}
diff --git a/services/src/main/java/io/druid/cli/CliHistorical.java b/services/src/main/java/io/druid/cli/CliHistorical.java
index 34761e003aa..c34b91d2188 100644
--- a/services/src/main/java/io/druid/cli/CliHistorical.java
+++ b/services/src/main/java/io/druid/cli/CliHistorical.java
@@ -84,8 +84,8 @@ public class CliHistorical extends ServerRunnable
             Jerseys.addResource(binder, QueryResource.class);
             Jerseys.addResource(binder, HistoricalResource.class);
             LifecycleModule.register(binder, QueryResource.class);
-            LifecycleModule.register(binder, HistoricalResource.class);
-            LifecycleModule.register(binder, ZkCoordinator.class);
+
+            LifecycleModule.register(binder, ZkCoordinator.class);            
 
             binder.bind(Cache.class).toProvider(CacheProvider.class).in(ManageLifecycle.class);
             JsonConfigProvider.bind(binder, "druid.historical.cache", CacheProvider.class);