diff --git a/src/Flow.cpp b/src/Flow.cpp
index 11fe2c94f0..11207b70e8 100644
--- a/src/Flow.cpp
+++ b/src/Flow.cpp
@@ -1443,6 +1443,7 @@ void Flow::periodic_stats_update(void *user_data, bool quick) {
 /* *************************************** */
 
 void Flow::periodic_dump_check(const struct timeval *tv) {
+  return; /* Temporarily disables flows and alerts dump */
   /* NOTE: this can be very time consuming */
   dumpFlowAlert();
 
diff --git a/src/NetworkInterface.cpp b/src/NetworkInterface.cpp
index 0ef73d2d58..76614a9454 100644
--- a/src/NetworkInterface.cpp
+++ b/src/NetworkInterface.cpp
@@ -2881,6 +2881,7 @@ void NetworkInterface::periodicHTStateUpdate(time_t deadline, lua_State* vm) {
     hasSeenVlanTaggedPackets() ? vlans_hash : NULL,
     macs_hash
   };
+  time_t update_end;
 
   periodicUpdateInitTime(&tv);
   periodic_ht_state_update_user_data.acle = NULL,
@@ -2903,8 +2904,14 @@ void NetworkInterface::periodicHTStateUpdate(time_t deadline, lua_State* vm) {
     }
   }
 
-  if(time(NULL) > deadline)
-    ntop->getTrace()->traceEvent(TRACE_ERROR, "Deadline exceeded [%s][%s]", __FUNCTION__, get_name());
+  if((update_end = time(NULL)) > deadline) {
+    char date_buf[32];
+    struct tm deadline_tm;
+
+    strftime(date_buf, sizeof(date_buf), "%H:%M:%S", localtime_r(&deadline, &deadline_tm));
+    ntop->getTrace()->traceEvent(TRACE_ERROR, "Deadline exceeded [%s][%s][expected: %s][off by: %u secs]",
+				 __FUNCTION__, get_name(), date_buf, update_end - deadline);
+  }
 }
 
 /* **************************************************** */