[AESH-45]
make sure we have no nullpointers