diff --git a/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java b/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java
index dd2022d1..1a9ec74b 100644
--- a/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java
+++ b/jetty-load-generator-client/src/main/java/org/mortbay/jetty/load/generator/LoadGenerator.java
@@ -294,6 +294,7 @@ public void failed(Throwable x) {
                     logger.debug("failed tree for {}", resource);
                 }
                 callback.failed(x);
+                LoadGenerator.this.interrupt();
             }
         }, nodes);
         Sender sender = new Sender(client, warmup, treeCallback);
diff --git a/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java b/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java
index 5db695d8..0a974d7e 100644
--- a/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java
+++ b/jetty-load-generator-client/src/test/java/org/mortbay/jetty/load/generator/FailFastTest.java
@@ -34,7 +34,6 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.servlet.ServletException;
@@ -42,8 +41,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class FailFastTest
@@ -152,7 +149,6 @@ protected void service( HttpServletRequest request, HttpServletResponse response
                 {
                     throw new RuntimeException( e.getMessage(), e );
                 }
-
             }
             response.getOutputStream().write( "Jetty rocks!!".getBytes() );
             response.flushBuffer();
diff --git a/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java b/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java
index 6fc74729..f0751bdd 100644
--- a/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java
+++ b/jetty-load-generator-starter/src/main/java/org/mortbay/jetty/load/generator/starter/AbstractLoadGeneratorStarter.java
@@ -81,6 +81,11 @@ public void run()
             .warmupIterationsPerThread( starterArgs.getWarmupNumber() ) //
             .scheme( starterArgs.getScheme() ); //
 
+        if (starterArgs.getThreads() > 0)
+        {
+            loadGeneratorBuilder.threads( starterArgs.getThreads() );
+        }
+
         if ( starterArgs.getMaxRequestsQueued() > 0 )
         {
             loadGeneratorBuilder.maxRequestsQueued( starterArgs.getMaxRequestsQueued() );
@@ -91,11 +96,6 @@ public void run()
             loadGeneratorBuilder.executor( getExecutorService() );
         }
 
-        if ( starterArgs.getThreads() > 0 )
-        {
-            loadGeneratorBuilder.threads( starterArgs.getThreads() );
-        }
-
         if ( starterArgs.getRunningTime() > 0 )
         {
             loadGeneratorBuilder.runFor( starterArgs.getRunningTime(), starterArgs.getRunningTimeUnit() );