better exception handling (CF), batch selection