Merged.
Better error output.