What does this pull request do?

Fixes null pointer exception described in the issue.

Interested parties

@chenejac @ivanmrsulja