Merge "Revert "strerror: incl enum name""