Fixed NPE in storage class