diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy
index 4d580c56cf4..80541b43f42 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy
@@ -50,7 +50,7 @@ public class AntTask extends DefaultTask {
         // remove existing loggers, we add our own
         List<BuildLogger> toRemove = new ArrayList<>();
         for (BuildListener listener : ant.project.getBuildListeners()) {
-            if (l instanceof BuildLogger) {
+            if (listener instanceof BuildLogger) {
                 toRemove.add(listener);
             }
         }
diff --git a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java
index 27cab01e606..fe94aea1a0a 100644
--- a/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java
+++ b/core/src/main/java/org/elasticsearch/search/profile/InternalProfileShardResults.java
@@ -66,8 +66,9 @@ public final class InternalProfileShardResults implements Writeable<InternalProf
                 ProfileShardResult result = new ProfileShardResult(in);
                 shardResult.add(result);
             }
-            shardResults.put(key, shardResult);
+            shardResults.put(key, Collections.unmodifiableList(shardResult));
         }
+        shardResults = Collections.unmodifiableMap(shardResults);
     }
 
     public Map<String, List<ProfileShardResult>> getShardResults() {
diff --git a/core/src/test/java/org/elasticsearch/search/profile/QueryProfilerIT.java b/core/src/test/java/org/elasticsearch/search/profile/QueryProfilerIT.java
index 271a9b5ae88..f09b18bdb8a 100644
--- a/core/src/test/java/org/elasticsearch/search/profile/QueryProfilerIT.java
+++ b/core/src/test/java/org/elasticsearch/search/profile/QueryProfilerIT.java
@@ -81,6 +81,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
                     .execute().actionGet();
 
             assertNotNull("Profile response element should not be null", resp.getProfileResults());
+            assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
             for (Map.Entry<String, List<ProfileShardResult>> shard : resp.getProfileResults().entrySet()) {
                 for (ProfileShardResult searchProfiles : shard.getValue()) {
                     for (ProfileResult result : searchProfiles.getQueryResults()) {
@@ -203,6 +204,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
 
         Map<String, List<ProfileShardResult>> p = resp.getProfileResults();
         assertNotNull(p);
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {
@@ -248,6 +250,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
 
         Map<String, List<ProfileShardResult>> p = resp.getProfileResults();
         assertNotNull(p);
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {
@@ -315,6 +318,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
                 .execute().actionGet();
 
         assertNotNull("Profile response element should not be null", resp.getProfileResults());
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {
@@ -366,6 +370,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
                 .execute().actionGet();
 
         assertNotNull("Profile response element should not be null", resp.getProfileResults());
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {
@@ -412,6 +417,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
                 .execute().actionGet();
 
         assertNotNull("Profile response element should not be null", resp.getProfileResults());
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {
@@ -458,6 +464,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
                 .execute().actionGet();
 
         assertNotNull("Profile response element should not be null", resp.getProfileResults());
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {
@@ -503,6 +510,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
                 .execute().actionGet();
 
         assertNotNull("Profile response element should not be null", resp.getProfileResults());
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {
@@ -557,6 +565,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
         }
 
         assertNotNull("Profile response element should not be null", resp.getProfileResults());
+        assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
 
         for (Map.Entry<String, List<ProfileShardResult>> shardResult : resp.getProfileResults().entrySet()) {
             for (ProfileShardResult searchProfiles : shardResult.getValue()) {