Fixed null pointer exception
Merge pull request #164 from ravazquez/develop

Fixed null pointer exception