Fix #1401: Properly check if we have nodes present in localStorage
Merge branch '1401' into develop