BUG FIX: NPE at DataProvider