Revert "temporarily swap error values"

This reverts commit 3888dda6bd3bc4750ab61513d76072c396f3af74.