antoniop
committed
on 25 Apr 23
Avoid dubious catches, collect more logics in the proc