Fix fire extinguishing npe