Added empty list case