Merge branch 'nd/error-errno'