Added a null check to tank air block