Fix the way save options are handled to avoid potential NPE