Fix multiple instances of 'no-else-raise' warning.
Before v3.1 there existed a draft wni storage. You can find it in the git history
(it was in /core/storage directory, now gone)