V0.96.2: merge pull request #7; fix error when cookie DNE