Prevent NPE in unittests.
Merge pull request #8 from Weltraumschaf/master

merge in update