Fixing NPE upon launch
Merge pull request #720 from bhariharan/unstable

Fixing NPE upon launch