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