fix null pointer
Merge branch 'master' of ssh://git@github.com/mpries/IAA_HA.git