Fixed: check store exists first