Fix storage wrapper being called with null