Fixed a NPE
Merge pull request #2589 from dominikl/bug_12365

Fixed NPE