Fix possible NPE in TankManager