Avoid NPE + tracing (needs to be fixed)