Fixed bad bug given #329.

By using finally, every request had a wait applied to it.  Major slowdowns ensued.  Uncovered via performance tests.