Expanded Errors section to cover more