Fixed NullReference! Yay for more errors