Code cleanup based on PhpStorm inspector
Fix Session Storage when using None.