rf_expand_data(address_item *addr, uschar *s, int *prc)
{
uschar *yield = expand_string(s);
-if (yield != NULL) return yield;
+if (yield) return yield;
if (f.expand_string_forcedfail)
{
DEBUG(D_route) debug_printf("forced failure for expansion of \"%s\"\n", s);