Add specific nil handling.