Fixed an NPE
Merge pull request #1382 from priand/playground2

Fixed an NPE