SECOAUTH-385: add null check for safety