Feature/mob 2147 swa integration 2

double nullcheck