Fixing storage error throwing
Merge pull request #205 from rootcoma/storage_fix

Fixing storage error throwing