Merge "trace: prevent NULL pointer dereference"