ACRA + fix for NPE in restoring state
fir for saving empty state