Handle this a bit better

Includes a unit test and a more correct execution path.
Whoops, accidental deletion
Merge pull request #16 from runningferret/feature/handle_interrupted_betterer

Feature/handle interrupted betterer