Merge "Propagate errors through trap"