Reduce work on aborted requests

Closes #129
Includes testcase