Fixed the nil point exception... again