Check for null in the converter
Added the mfpak integration and adjusted the test