[Coselmar-commits] 01/19: prevent NPE