Should fix #1261 and show an error if consolidating files fails.