Renamed something, checked something for null..