diff --git a/421xxx/421400/mc.MG_ttbar_LHEtest.py b/950xxx/950100/mc.MG_ttbar_LHEtest_valid.py
similarity index 100%
rename from 421xxx/421400/mc.MG_ttbar_LHEtest.py
rename to 950xxx/950100/mc.MG_ttbar_LHEtest_valid.py
diff --git a/421xxx/421401/mc.aMC_ttbar_LHEtest.py b/950xxx/950101/mc.aMC_ttbar_LHEtest_valid.py
similarity index 100%
rename from 421xxx/421401/mc.aMC_ttbar_LHEtest.py
rename to 950xxx/950101/mc.aMC_ttbar_LHEtest_valid.py
diff --git a/421xxx/421402/mc.MG_ttbar_LHAPDFTest.py b/950xxx/950102/mc.MG_ttbar_LHAPDFTest_valid.py
similarity index 100%
rename from 421xxx/421402/mc.MG_ttbar_LHAPDFTest.py
rename to 950xxx/950102/mc.MG_ttbar_LHAPDFTest_valid.py
diff --git a/421xxx/421403/mc.MG_ttbar_BaseFragmentTest.py b/950xxx/950103/mc.MG_ttbar_BaseFragmentTest_valid.py
similarity index 100%
rename from 421xxx/421403/mc.MG_ttbar_BaseFragmentTest.py
rename to 950xxx/950103/mc.MG_ttbar_BaseFragmentTest_valid.py
diff --git a/421xxx/421404/mc.aMC_ttbar_BaseFragmentGridpackTest.py b/950xxx/950104/mc.aMC_ttbar_BaseFragmentGridpackTest_valid.py
similarity index 100%
rename from 421xxx/421404/mc.aMC_ttbar_BaseFragmentGridpackTest.py
rename to 950xxx/950104/mc.aMC_ttbar_BaseFragmentGridpackTest_valid.py
diff --git a/421xxx/421405/mc.MG_ttbar_SystTest.py b/950xxx/950105/mc.MG_ttbar_SystTest_valid.py
similarity index 100%
rename from 421xxx/421405/mc.MG_ttbar_SystTest.py
rename to 950xxx/950105/mc.MG_ttbar_SystTest_valid.py
diff --git a/421xxx/421406/mc.aMC_ttbar_SystTest.py b/950xxx/950106/mc.aMC_ttbar_SystTest_valid.py
similarity index 100%
rename from 421xxx/421406/mc.aMC_ttbar_SystTest.py
rename to 950xxx/950106/mc.aMC_ttbar_SystTest_valid.py
diff --git a/421xxx/421407/mc.MG_ttbar_MadSpinTest.py b/950xxx/950107/mc.MG_ttbar_MadSpinTest_valid.py
similarity index 100%
rename from 421xxx/421407/mc.MG_ttbar_MadSpinTest.py
rename to 950xxx/950107/mc.MG_ttbar_MadSpinTest_valid.py
diff --git a/421xxx/421408/mc.aMC_ttbar_MadSpinTest.py b/950xxx/950108/mc.aMC_ttbar_MadSpinTest_valid.py
similarity index 100%
rename from 421xxx/421408/mc.aMC_ttbar_MadSpinTest.py
rename to 950xxx/950108/mc.aMC_ttbar_MadSpinTest_valid.py
diff --git a/421xxx/421409/mc.MG_ttbar_gridpackTest.py b/950xxx/950109/mc.MG_ttbar_gridpackTest_valid.py
similarity index 100%
rename from 421xxx/421409/mc.MG_ttbar_gridpackTest.py
rename to 950xxx/950109/mc.MG_ttbar_gridpackTest_valid.py
diff --git a/421xxx/421410/mc.aMC_ttbar_gridpackTest.py b/950xxx/950110/mc.aMC_ttbar_gridpackTest_valid.py
similarity index 100%
rename from 421xxx/421410/mc.aMC_ttbar_gridpackTest.py
rename to 950xxx/950110/mc.aMC_ttbar_gridpackTest_valid.py
diff --git a/421xxx/421411/mc.aMC_ttbar_gridpackClusterTest.py b/950xxx/950111/mc.aMC_ttbar_gridpackClusterTest_valid.py
similarity index 78%
rename from 421xxx/421411/mc.aMC_ttbar_gridpackClusterTest.py
rename to 950xxx/950111/mc.aMC_ttbar_gridpackClusterTest_valid.py
index 4eb77dafeba89de79feafffab47f8552b51c5af1..4e8f7959abc995b315f0db8035798fc7a27d39e6 100644
--- a/421xxx/421411/mc.aMC_ttbar_gridpackClusterTest.py
+++ b/950xxx/950111/mc.aMC_ttbar_gridpackClusterTest_valid.py
@@ -60,9 +60,20 @@ decay t~ > w- b~, w- > all all
 launch''')
 fMadSpinCard.close()  
 
-generate(run_card_loc='run_card.dat',param_card_loc=None,mode=mode,njobs=njobs,proc_dir=process_dir,run_name=runName,madspin_card_loc=madspin_card_loc,
-         grid_pack=gridpack_mode,gridpack_dir=gridpack_dir,nevents=nevents,random_seed=runArgs.randomSeed,
-         cluster_type=cluster_type,cluster_queue=cluster_queue)
+try:
+    generate(run_card_loc='run_card.dat',param_card_loc=None,mode=mode,njobs=njobs,proc_dir=process_dir,run_name=runName,madspin_card_loc=madspin_card_loc,
+             grid_pack=gridpack_mode,gridpack_dir=gridpack_dir,nevents=nevents,random_seed=runArgs.randomSeed,
+             cluster_type=cluster_type,cluster_queue=cluster_queue)
+except RuntimeError as rte:
+    for an_arg in rte.args:
+        if 'Gridpack sucessfully created' in an_arg:
+            print 'Handling exception and exiting'
+            theApp.finalize()
+            theApp.exit()
+    print 'Unhandled exception - re-raising'
+    raise rte
+
+# Only arrange the output if we weren't making a grid pack
 arrange_output(run_name=runName,proc_dir=process_dir,outputDS=runName+'._00001.events.tar.gz',lhe_version=3,saveProcDir=True)
 
 ############################
diff --git a/421xxx/421412/mc.MGPy8EG_ttbar_MCOREtest.py b/950xxx/950112/mc.MGPy8EG_ttbar_MCOREtest_valid.py
similarity index 100%
rename from 421xxx/421412/mc.MGPy8EG_ttbar_MCOREtest.py
rename to 950xxx/950112/mc.MGPy8EG_ttbar_MCOREtest_valid.py
diff --git a/421xxx/421413/mc.MG_ttbar_ReweightTest.py b/950xxx/950113/mc.MG_ttbar_ReweightTest_valid.py
similarity index 100%
rename from 421xxx/421413/mc.MG_ttbar_ReweightTest.py
rename to 950xxx/950113/mc.MG_ttbar_ReweightTest_valid.py
diff --git a/421xxx/421414/mc.aMC_ttbar_ReweightTest.py b/950xxx/950114/mc.aMC_ttbar_ReweightTest_valid.py
similarity index 100%
rename from 421xxx/421414/mc.aMC_ttbar_ReweightTest.py
rename to 950xxx/950114/mc.aMC_ttbar_ReweightTest_valid.py
diff --git a/421xxx/421415/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl.py b/950xxx/950115/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl_valid.py
similarity index 100%
rename from 421xxx/421415/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl.py
rename to 950xxx/950115/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl_valid.py
diff --git a/421xxx/421416/mc.MGPy8EG_A14NNPDF23_ttbar_Incl.py b/950xxx/950116/mc.MGPy8EG_A14NNPDF23_ttbar_Incl_valid.py
similarity index 100%
rename from 421xxx/421416/mc.MGPy8EG_A14NNPDF23_ttbar_Incl.py
rename to 950xxx/950116/mc.MGPy8EG_A14NNPDF23_ttbar_Incl_valid.py
diff --git a/421xxx/421417/mc.MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.py b/950xxx/950117/mc.MGPy8EG_A14NNPDF23_ttbar_Merge_Np01_valid.py
similarity index 96%
rename from 421xxx/421417/mc.MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.py
rename to 950xxx/950117/mc.MGPy8EG_A14NNPDF23_ttbar_Merge_Np01_valid.py
index 774fb236bdd38a18084e0bbe9aa01ef0a998b16f..ffb37181122e970a3dd8819f628de33c276d48c4 100644
--- a/421xxx/421417/mc.MGPy8EG_A14NNPDF23_ttbar_Merge_Np01.py
+++ b/950xxx/950117/mc.MGPy8EG_A14NNPDF23_ttbar_Merge_Np01_valid.py
@@ -1,7 +1,7 @@
 from MadGraphControl.MadGraphUtils import *
 
 # Nevents setting -- allow for merging losses
-nevents = runArgs.maxEvents*3.0 if runArgs.maxEvents>0 else 15000
+nevents = runArgs.maxEvents*4.0 if runArgs.maxEvents>0 else 20000
 
 # Set up process
 process = """
diff --git a/421xxx/421418/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl.py b/950xxx/950118/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl_valid.py
similarity index 100%
rename from 421xxx/421418/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl.py
rename to 950xxx/950118/mc.aMCPy8EG_A14NNPDF23_ttbar_Incl_valid.py