fix null safe for lambda call