Disruption refactoring

**DO NOT MERGE**

pr to open the discussion on disruption handling 
You add a space before the catch, but you don't change the & spacing? ;)