fixed a storage null issue