Fix for NPE
Fix for NPE
Merge pull request #275 from bhariharan/unstable20

Fix for NPE