fix: wrap errors using %w to preserve context (#1321)

fix: wrap errors using %w to preserve context (#1321) #524