Fix NPE on WebStorm8 (fixes #671)
Merge pull request #673 from dlsniper/fix-671

Fix NPE on WebStorm8 (fixes #671)