lets commit the long forgotten checks for BatchContext