killbill-memoizeit

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/MeterResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/MeterResource.java
index f44ada5..e63caf0 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/MeterResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/MeterResource.java
@@ -97,7 +97,7 @@ public class MeterResource extends JaxRsResourceBase {
             @Override
             public void write(final OutputStream output) throws IOException, WebApplicationException {
                 // Look at aggregates per category?
-                if (categories != null) {
+                if (categories != null && categories.size() > 0) {
                     if (Strings.isNullOrEmpty(timeAggregationModeString)) {
                         meterApi.getUsage(output, source, categories, fromTimestamp, toTimestamp, tenantContext);
                     } else {

diff --git a/meter/src/main/java/com/ning/billing/meter/glue/MeterModule.java b/meter/src/main/java/com/ning/billing/meter/glue/MeterModule.java
index e406802..85984b5 100644
--- a/meter/src/main/java/com/ning/billing/meter/glue/MeterModule.java
+++ b/meter/src/main/java/com/ning/billing/meter/glue/MeterModule.java
@@ -26,6 +26,7 @@ import com.ning.billing.meter.DefaultMeterService;
 import com.ning.billing.meter.MeterService;
 import com.ning.billing.meter.api.MeterUserApi;
 import com.ning.billing.meter.api.user.DefaultMeterUserApi;
+import com.ning.billing.meter.timeline.TimelineEventHandler;
 import com.ning.billing.meter.timeline.codec.DefaultSampleCoder;
 import com.ning.billing.meter.timeline.codec.SampleCoder;
 import com.ning.billing.meter.timeline.persistent.FileBackedBuffer;
@@ -84,11 +85,16 @@ public class MeterModule extends AbstractModule {
         bind(MeterService.class).to(DefaultMeterService.class).asEagerSingleton();
     }
 
+    protected void installTimelineEventHandler() {
+        bind(TimelineEventHandler.class).asEagerSingleton();
+    }
+
     @Override
     protected void configure() {
         final MeterConfig config = installConfig();
 
         installMeterService();
+        installTimelineEventHandler();
         configureFileBackedBuffer(config);
         configureDao();
         configureTimelineObjects();