fixed a few more NPE's