null bug, check for null
Merge branch 'ppar' of https://github.com/nimonikMike/GGZ into ppar