fix of NullPointerException in Storage