@@ -1,15 +1,15 @@
 ;; make-vector-record tests testqueue testname testconfig waitons priority items
 (define (make-tests:testqueue)(make-vector 7 #f))
-(define-inline (tests:testqueue-get-testname     vec)    (vector-ref  vec 0))
-(define-inline (tests:testqueue-get-testconfig   vec)    (vector-ref  vec 1))
-(define-inline (tests:testqueue-get-waitons      vec)    (vector-ref  vec 2))
-(define-inline (tests:testqueue-get-priority     vec)    (vector-ref  vec 3))
+(define-inline (tests:testqueue-get-testname     vec)    (safe-vector-ref  vec 0))
+(define-inline (tests:testqueue-get-testconfig   vec)    (safe-vector-ref  vec 1))
+(define-inline (tests:testqueue-get-waitons      vec)    (safe-vector-ref  vec 2))
+(define-inline (tests:testqueue-get-priority     vec)    (safe-vector-ref  vec 3))
 ;; items: #f=no items, list=list of items remaining, proc=need to call to get items
-(define-inline (tests:testqueue-get-items        vec)    (vector-ref  vec 4))
-(define-inline (tests:testqueue-get-itemdat      vec)    (vector-ref  vec 5))
-(define-inline (tests:testqueue-get-item_path    vec)    (vector-ref  vec 6))
+(define-inline (tests:testqueue-get-items        vec)    (safe-vector-ref  vec 4))
+(define-inline (tests:testqueue-get-itemdat      vec)    (safe-vector-ref  vec 5))
+(define-inline (tests:testqueue-get-item_path    vec)    (safe-vector-ref  vec 6))
 
 (define-inline (tests:testqueue-set-testname!    vec val)(vector-set! vec 0 val))
 (define-inline (tests:testqueue-set-testconfig!  vec val)(vector-set! vec 1 val))
 (define-inline (tests:testqueue-set-waitons!     vec val)(vector-set! vec 2 val))
 (define-inline (tests:testqueue-set-priority!    vec val)(vector-set! vec 3 val))