make interrupt not blow up all tests

@steved555 @pswadi-zendesk 

still having that issue, at least this way it just raises and does not kill all my tests ...

### Risks
 - None