Fixing a couple of NullPointerError bugs i forget.