fix when GW is null
update