Fix NPE + always save bug