Make sure the Trace/Annotate/Wrap functions return nil if the error is nil
Merge pull request #4 from howbazaar/handle-nil

Make sure the Trace/Annotate/Wrap functions return nil if the error is nil