Fixed (possible) NPE (Part 2)