diff --git a/build-tools-internal/src/main/groovy/elasticsearch.build-complete.gradle b/build-tools-internal/src/main/groovy/elasticsearch.build-complete.gradle
index 32967f03c687..f8024f65cf04 100644
--- a/build-tools-internal/src/main/groovy/elasticsearch.build-complete.gradle
+++ b/build-tools-internal/src/main/groovy/elasticsearch.build-complete.gradle
@@ -23,7 +23,6 @@ if (buildNumber && performanceTest == null) {
         fileset(dir: projectDir) {
           Set<File> fileSet = fileTree(projectDir) {
             include("**/*.hprof")
-            include(".gradle/reaper/**")
             include("**/build/test-results/**/*.xml")
             include("**/build/testclusters/**")
             exclude("**/build/testclusters/**/data/**")
@@ -49,6 +48,8 @@ if (buildNumber && performanceTest == null) {
         }
 
         fileset(dir: "${gradle.gradleUserHomeDir}/workers", followsymlinks: false)
+
+        fileset(dir: "${project.projectDir}/.gradle/reaper", followsymlinks: false)
       }
     } catch (Exception e) {
       logger.lifecycle("Failed to archive additional logs", e)
diff --git a/build-tools/reaper/src/main/java/org/elasticsearch/gradle/reaper/Reaper.java b/build-tools/reaper/src/main/java/org/elasticsearch/gradle/reaper/Reaper.java
index f5a24eba3687..e6c5b61e0a76 100644
--- a/build-tools/reaper/src/main/java/org/elasticsearch/gradle/reaper/Reaper.java
+++ b/build-tools/reaper/src/main/java/org/elasticsearch/gradle/reaper/Reaper.java
@@ -83,17 +83,17 @@ public class Reaper implements Closeable {
                     delete(inputFile);
                 }
             }
-        } catch (Exception e) {
+        } catch (Throwable e) {
+            failed = true;
             logFailure("Failed to reap inputs", e);
         }
     }
 
-    private void logFailure(String message, Exception e) {
+    private void logFailure(String message, Throwable e) {
         System.err.println(message);
         if (e != null) {
             e.printStackTrace(System.err);
         }
-        failed = true;
     }
 
     private void delete(Path toDelete) {
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/ReaperService.java b/build-tools/src/main/java/org/elasticsearch/gradle/ReaperService.java
index ece27cef7b66..d63efbe3e55c 100644
--- a/build-tools/src/main/java/org/elasticsearch/gradle/ReaperService.java
+++ b/build-tools/src/main/java/org/elasticsearch/gradle/ReaperService.java
@@ -78,7 +78,7 @@ public abstract class ReaperService implements BuildService<ReaperService.Params
                 logger.info("Waiting for reaper to exit normally");
                 if (reaperProcess.waitFor() != 0) {
                     Path inputDir = getParameters().getInputDir().get().getAsFile().toPath();
-                    throw new GradleException("Reaper process failed. Check log at " + inputDir.resolve("error.log") + " for details");
+                    throw new GradleException("Reaper process failed. Check log at " + inputDir.resolve("reaper.log") + " for details");
                 }
             } catch (Exception e) {
                 throw new RuntimeException(e);
@@ -109,7 +109,7 @@ public abstract class ReaperService implements BuildService<ReaperService.Params
                 builder.redirectInput(ProcessBuilder.Redirect.PIPE);
                 File logFile = logFilePath().toFile();
                 builder.redirectOutput(logFile);
-                builder.redirectError(logFile);
+                builder.redirectErrorStream();
                 reaperProcess = builder.start();
             } catch (Exception e) {
                 throw new RuntimeException(e);