Do not throw nullpointer if mfpak does not have options
Merge remote-tracking branch 'origin/master'