diff --git a/exercises/chapter8.clj b/exercises/chapter8.clj
index 8a42667..769c86f 100644
--- a/exercises/chapter8.clj
+++ b/exercises/chapter8.clj
@@ -4,12 +4,16 @@
   (go
     (loop []
       (let [body (<! body-chan)
-            wheel1 (<! wheel-chan)
-            bw (attach-wheel body wheel1)
-            wheel2 (<! wheel-chan)bww (attach-wheel bw wheel2)box (box-up bww)]
-        (println "Finished car")
-        (when (>! box-chan box)
-          (recur))))
+            wheel1 (<! wheel-chan)]
+        (when (and body wheel1)
+          (let [bw (attach-wheel body wheel1)
+                wheel2 (<! wheel-chan)]
+            (when wheel2
+              bww (attach-wheel bw wheel2)
+              box (box-up bww)
+              (println "Finished car")
+              (when (>! box-chan box)
+                (recur)))))))
     (async/close! body-chan)
     (async/close! wheel-chan)))