Adding more initialization checking.