gaurd against no trace
Merge pull request #2 from groundwater/gaurd-againts-no-trace

gaurd against no trace