[Wao-commits] 03/05: Correction NPE