Fixed null error with counter autosaving