fixed all the null exceptions