GH-137: Fix crash on startup when loading from Windows Registry
Merge pull request #138 from teshko/master

GH-137: Fix crash on startup when loading from Windows Registry