Version: 2.2.1
Refactor: Error code handling more explicit.