Avoiding empty lists again.