Merge "Use proper NO_ERROR checking KS return value"