Handle absence of localStorage gracefully
Merge branch 'dev'