Fixed NullPointer
Merge pull request #817 from Junkern/develop

Fixed NullPointer