Better handle cases where value is null.