Fixing in NPE in remote store