diff --git a/src/main/java/nl/hsac/fitnesse/fixture/slim/SlimFixture.java b/src/main/java/nl/hsac/fitnesse/fixture/slim/SlimFixture.java
index <HASH>..<HASH> 100644
--- a/src/main/java/nl/hsac/fitnesse/fixture/slim/SlimFixture.java
+++ b/src/main/java/nl/hsac/fitnesse/fixture/slim/SlimFixture.java
@@ -220,7 +220,7 @@ public class SlimFixture  implements InteractionAwareFixture {
      */
     public static class PollCompletion extends FunctionalCompletion {
         public PollCompletion(Supplier<Boolean> isFinishedSupplier) {
-            super(isFinishedSupplier, () -> {});
+            super(isFinishedSupplier, null);
         }
     }
 
@@ -246,7 +246,9 @@ public class SlimFixture  implements InteractionAwareFixture {
 
         @Override
         public void repeat() {
-            repeater.run();
+            if (repeater != null) {
+                repeater.run();
+            }
         }
 
         public void setIsFinishedSupplier(Supplier<Boolean> isFinishedSupplier) {
Remove need for no-op runnable if no repeat is needed