Code reshuffling to raise exception for current os null storages.
Improved error message.