Correctly check for the "null" string, stored in the cookie.
Merge branch 'code-cookiecheck'