Handle the Storage.service == null case
4 files changed