Fixed null current location
Fixed null current location

noordwind/Coolector.Web,noordwind/Collectively.Web,noordwind/Coolector.Web,noordwind/Collectively.Web,noordwind/Collectively.Web,noordwind/Coolector.Web