changed some code that caused a null error to comment