Added sanity check to prevent an exception
Merge branch 'fast_mpv_fit'