fix NPE #597
Merge pull request #598 from herau/597

fix NPE #597