Add logging; fix empty storage service problem