Clean up, capture InterruptedException properly