Explicitly return null for empty values

Explicitly return null for empty values #157324