Handle null values accordingly