Shortened a long error message to 80 characters per line
Merge branch 'error_branch'