Improved diet null handling.