More forgiving on error message to match different platforms