Update tracing + avoid NPE