Session storage tweaks

Checking for null value