import statements NPE fixed