More robustness to empty trees