TASK: NPE in storage