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