diff --git a/src/main/java/org/elasticsearch/index/cache/fixedbitset/FixedBitSetFilterCache.java b/src/main/java/org/elasticsearch/index/cache/fixedbitset/FixedBitSetFilterCache.java
index 176008d4314..cbd37c8461f 100644
--- a/src/main/java/org/elasticsearch/index/cache/fixedbitset/FixedBitSetFilterCache.java
+++ b/src/main/java/org/elasticsearch/index/cache/fixedbitset/FixedBitSetFilterCache.java
@@ -94,6 +94,13 @@ public class FixedBitSetFilterCache extends AbstractIndexComponent implements At
     @Inject(optional = true)
     public void setIndicesWarmer(IndicesWarmer indicesWarmer) {
         this.indicesWarmer = indicesWarmer;
+    }
+
+    public void setIndexService(InternalIndexService indexService) {
+        this.indexService = indexService;
+        // First the indicesWarmer is set and then the indexService is set, because of this there is a small window of
+        // time where indexService is null. This is why the warmer should only registered after indexService has been set.
+        // Otherwise there is a small chance of the warmer running into a NPE, since it uses the indexService
         indicesWarmer.addListener(warmer);
     }
 
@@ -164,10 +171,6 @@ public class FixedBitSetFilterCache extends AbstractIndexComponent implements At
         }).fixedBitSet;
     }
 
-    public void setIndexService(InternalIndexService indexService) {
-        this.indexService = indexService;
-    }
-
     @Override
     public void onRemoval(RemovalNotification<Object, Cache<Filter, Value>> notification) {
         Object key = notification.getKey();
@@ -283,10 +286,10 @@ public class FixedBitSetFilterCache extends AbstractIndexComponent implements At
                                 final long start = System.nanoTime();
                                 getAndLoadIfNotPresent(filterToWarm, ctx);
                                 if (indexShard.warmerService().logger().isTraceEnabled()) {
-                                    indexShard.warmerService().logger().trace("warmed random access for [{}], took [{}]", filterToWarm, TimeValue.timeValueNanos(System.nanoTime() - start));
+                                    indexShard.warmerService().logger().trace("warmed fixed bitset for [{}], took [{}]", filterToWarm, TimeValue.timeValueNanos(System.nanoTime() - start));
                                 }
                             } catch (Throwable t) {
-                                indexShard.warmerService().logger().warn("failed to load random access for [{}]", t, filterToWarm);
+                                indexShard.warmerService().logger().warn("failed to load fixed bitset for [{}]", t, filterToWarm);
                             } finally {
                                 latch.countDown();
                             }