Fixed Some NullPointers