Index: trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- trunk/FACT++/src/EventBuilderWrapper.h	(revision 13169)
+++ trunk/FACT++/src/EventBuilderWrapper.h	(revision 13170)
@@ -868,17 +868,19 @@
                 CloseRunFile(runNr, 0, 0);
                 break;
-            }
+                }
+                */
             if (beg->fEventCounter != ptr->fEventCounter)
             {
-                Error("Inconsist run number detected.... closing run.");
+                fMsg.Error("Inconsistent FAD event number detected.... closing run.");
                 CloseRunFile(runNr, 0, 0);
-                break;
-            }
+                return -1;
+            }
+
             if (beg->fTriggerCounter != ptr->fTriggerCounter)
             {
-                Error("Inconsist trigger number detected.... closing run.");
+                fMsg.Error("Inconsistent FTM trigger number detected.... closing run.");
                 CloseRunFile(runNr, 0, 0);
-                break;
-            }*/
+                return -1;
+            }
 
             if (beg->fAdcClockPhaseShift != ptr->fAdcClockPhaseShift)