JBIDE-16819 - messed up tracing. Damn
 JBIDE-16819 - messed up tracing. Damn
Small errors during testing, typos, bad trace, and possible npe