Merge "Fix "TypeError: Cannot read property 'x' of null" on SF traces"