JBIDE-16819 - messed up tracing. Null check added