Resolving the Errors

The change

This pull request has no written description — the diff itself tells the story. Read it on GitHub via the button above.