Better handling of empty (false) returned values