Added some more handling so that start trace events are only logged iff there is no context