Squashing bugs 1

still have null pointer exception
fixed one