Improve out-of-sync error reporting