[Faxtomail-commits] 03/04: Fix potential NPE