Fixed some null reference