fix for merging in data during error