[#920] Handle empty values