diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt
index b3837451e0..1aaa205d61 100644
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/2htdp/private/clauses-spec-aux.rkt
@@ -34,8 +34,8 @@
 (define ip> string>)
 
 ;; Symbol X Nat -> X
-(define (proc> tag f ar)
-  (check-proc tag f ar "first" (if (> ar 1) (format "~a arguments" ar) "one argument"))
+(define (proc> tag f ar #:place (place "first"))
+  (check-proc tag f ar place (if (> ar 1) (format "~a arguments" ar) "one argument"))
   f)
 
 ;; Symbol X (Number -> Boolean) String String -> X
diff --git a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt
index b6c5621de4..c6a4d64472 100644
--- a/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/2htdp/universe.rkt
@@ -112,7 +112,7 @@
               #:except
               [(_ stop? last-picture)
                #'(list (proc> 'stop-when (f2h stop?) 1)
-                       (proc> 'stop-when (f2h last-picture) 1))])]
+                       (proc> 'stop-when (f2h last-picture) 1 #:place "second"))])]
   ;; (U #f Any)
   ;; -- should the session be recorded and turned into PNGs and an animated GIF
   ;; -- if the value is a string and is the name of a local directory, use it! 
diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/xtest b/pkgs/htdp-pkgs/htdp-test/2htdp/xtest
index 30ab0dd673..c95f473491 100755
--- a/pkgs/htdp-pkgs/htdp-test/2htdp/xtest
+++ b/pkgs/htdp-pkgs/htdp-test/2htdp/xtest
@@ -10,6 +10,7 @@ run() {
 
 cd tests 
 
+run stop-when-error.rkt
 run key-error.rkt
 run run-movie.rkt
 run bad-draw.rkt