Fixed stupid null exception