Better handling of empty (false) returned values

I realized my previous PR was not enough and found a missing case.