Adjusted returnCodes, see related issue.