Added NULL for all values returned by the factory