BUG-731: rework catch clausule