Adding a null check guard, fixing STRATOS-848