LPS-46689 Don't pass null to the app server