diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogFilter.java b/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogFilter.java
index a5f707e5..a86c1bd7 100644
--- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogFilter.java
+++ b/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionLogFilter.java
@@ -14,7 +14,7 @@ public class GradleEnterpriseExceptionLogFilter extends ConsoleLogFilter impleme
     @Override
     public OutputStream decorateLogger(Run build, OutputStream logger) {
         InjectionConfig injectionConfig = InjectionConfig.get();
-        if (injectionConfig.isEnabled() && injectionConfig.isCheckForBuildAgentErrors()) {
+        if (injectionConfig.isEnabled() && injectionConfig.isCheckForBuildAgentErrors() && build != null) {
             return new GradleEnterpriseExceptionLogProcessor(logger, build);
         }
         return logger;
diff --git a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionTaskListenerDecoratorFactory.java b/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionTaskListenerDecoratorFactory.java
index 0b0d7aa8..a74298d7 100644
--- a/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionTaskListenerDecoratorFactory.java
+++ b/src/main/java/hudson/plugins/gradle/injection/GradleEnterpriseExceptionTaskListenerDecoratorFactory.java
@@ -51,7 +51,7 @@ public GradleEnterpriseExceptionTaskListenerDecorator(Run run) {
         @Nonnull
         @Override
         public OutputStream decorate(@Nonnull OutputStream logger) {
-            if (isBuildAgentErrorsEnabled()) {
+            if (run != null) {
                 return new GradleEnterpriseExceptionLogProcessor(logger, run);
             }
             return logger;
diff --git a/src/test/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleWithDurableTaskStepUseWatchingIntegrationTest.groovy b/src/test/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleWithDurableTaskStepUseWatchingIntegrationTest.groovy
index 9c2c7030..0ab6ec0d 100644
--- a/src/test/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleWithDurableTaskStepUseWatchingIntegrationTest.groovy
+++ b/src/test/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleWithDurableTaskStepUseWatchingIntegrationTest.groovy
@@ -75,6 +75,11 @@ class BuildScanInjectionGradleWithDurableTaskStepUseWatchingIntegrationTest exte
         then:
         j.assertLogContains('password=****', secondRun)
         j.assertLogNotContains(secret, secondRun)
+
+        cleanup:
+        System.err.println('---%<--- agent logs')
+        agent.computer.logText.writeLogTo(0, System.err)
+        System.err.println('--->%---')
     }
 
 }
diff --git a/src/test/groovy/hudson/plugins/gradle/injection/GradleSnippets.groovy b/src/test/groovy/hudson/plugins/gradle/injection/GradleSnippets.groovy
index 46dc25fe..ecd84248 100644
--- a/src/test/groovy/hudson/plugins/gradle/injection/GradleSnippets.groovy
+++ b/src/test/groovy/hudson/plugins/gradle/injection/GradleSnippets.groovy
@@ -32,19 +32,19 @@ class GradleSnippets {
     static WorkflowJob pipelineJobWithCredentials(JenkinsRule j) {
         def pipelineJob = j.createProject(WorkflowJob)
 
-        pipelineJob.setDefinition(new CpsFlowDefinition("""
+        pipelineJob.setDefinition(new CpsFlowDefinition('''
     stage('Build') {
       node('foo') {
         withCredentials([string(credentialsId: 'my-creds', variable: 'PASSWORD')]) {
           if (isUnix()) {
-            sh "echo password=\$PASSWORD"
+            sh 'echo password=$PASSWORD'
           } else {
             bat "echo password=%PASSWORD%"
           }
         }
       }
     }
-""", false))
+''', false))
         return pipelineJob
     }