Avoid NPEs seen in logs of build machine