Quickly prevent NPEs in machines with empty tanks