null warnings removed