Fixed consuing null warnings