Updated services - no crash with empty stores.