Fixing import stub NPE