[#52222991] fixes nil check problem