Fixed a problem were a trace accesses a data member that may be
outside of the actual data structure passed in.
Added some more debug traces.

2 files changed