Fixed one NullReferenceException