Merge "Refine error causes to make them more clear"