Updated function tracer

* Import DRY
* Broader catch
Merge pull request #1412 from mfalesni/tracer-update

Updated function tracer