[demoAvoidance] added --catching option to the module