FIX several NPEs
Some more NPEs
Another NPE found