Fixed NPE in DataProxy