diff --git a/base/statistics.cc b/base/statistics.cc
index 78012bff7..6e3dae1ef 100644
--- a/base/statistics.cc
+++ b/base/statistics.cc
@@ -273,7 +273,8 @@ check()
     for (i = Database::stats().begin(); i != end; ++i) {
         StatData *data = *i;
         assert(data);
-        data->check();
+        if (!data->check() || !data->baseCheck())
+            panic("stat check failed for %s\n", data->name);
     }
 
     int j = 0;
diff --git a/base/stats/statdb.cc b/base/stats/statdb.cc
index eed3d6296..66871b9f7 100644
--- a/base/stats/statdb.cc
+++ b/base/stats/statdb.cc
@@ -51,6 +51,10 @@ find(void *stat)
 void
 regBin(MainBin *bin, const std::string &_name)
 {
+    bin_list_t::iterator i, end = bins().end();
+    for (i = bins().begin(); i != end; ++i)
+        if ((*i)->name() == _name)
+            panic("re-registering bin %s", _name);
     bins().push_back(bin);
     DPRINTF(Stats, "registering %s\n", _name);
 }