NullPointer exception removed.