Handle case when after a delete store remains empty

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>