Catch exceptions when changing storage locations.
Use an exception instead :/
Catch the exception!
Merge pull request #1614 from Mnkras/hotfix/catch-storage-exceptions

Catch storage exceptions