Index: /trunk/FACT++/src/ratescan.cc
===================================================================
--- /trunk/FACT++/src/ratescan.cc	(revision 12912)
+++ /trunk/FACT++/src/ratescan.cc	(revision 12913)
@@ -173,11 +173,4 @@
             }
 
-            if (sdata.fTriggerRate==0)
-            {
-                Message("Rate scan stopped due zero trigger rate.");
-                fThreshold = -1;
-                return;
-            }
-
             fRate += sdata.fTriggerRate;
             for (int i=0; i<40; i++)
@@ -204,4 +197,11 @@
                 Info(out);
 
+                return;
+            }
+
+            if (fRate)
+            {
+                Message("Rate scan stopped due to zero collected triggers.");
+                fThreshold = -1;
                 return;
             }