Fixed regression. Better handling of empty activity list case