diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
index 4267eba21b9958b5c1b06474064ce7178146056e..1ad5aba7cf8f9b10d94b4f11f5dc3afc96590006 100644
--- a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
+++ b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
@@ -481,15 +481,28 @@ def ConfigureBeamBunchSpacing():
         if not jobproperties.Beam.beamType.is_locked():
             ConfigureBeamType()
         if jobproperties.Beam.beamType() == 'collisions':
+            runnumber = GetRunNumber()
+            if runnumber is None:
+                  logAutoConfiguration.info("Couldn't get run number. Aborting.")
+                  return
+            if (runnumber<236107): # run-1
+                  logAutoConfiguration.info("Run-1 data, set to 50ns.")
+                  jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50)
+                  # could have just left default, but at least this is explicit.
+                  pass
             #Real data collision run, try to get bunch spacing from database
             from CoolConvUtilities.BunchSpacingUtils import bunchSpacingOfRun
-            bc=bunchSpacingOfRun(GetRunNumber(),GetLBNumber())
+            bc=bunchSpacingOfRun(runnumber,GetLBNumber())
             if bc is not None and bc==1: 
                 jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25)
                 logAutoConfiguration.info("Autoconfigure bunch-spacing to 25 ns")
             else:
-                logAutoConfiguration.info("No data or larger bunch spacing, autoconfigure to 50 ns")
-                pass
+                if bc is None:
+                  logAutoConfiguration.info("No data, autoconfigure to 25 ns")
+                  jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25)
+                else: 
+                  logAutoConfiguration.info("No data or larger bunch spacing, autoconfigure to 50 ns")
+                  pass
             pass
         else:
             logAutoConfiguration.info("Not a collisions run, bunch spacing not autoconfigured")