SWF-2500 : Fix crash for intranet 3.5.x