Fixes NPE
Remove Unnecessary Usings
Merge pull request #430 from SlavaRa/fixes-TraceManager

Fixes Null References Error from TraceManager.Add(null);
Merge branch 'master' into tests