Instead of caveats, add to the estimate. Every caveat is some additional time.

Another thing that helped us is to answer with ranges instead of dates e.g., "this will take 1-3 weeks".