diff --git a/htdocs/always.php b/htdocs/always.php
index 00b370f5..18e128ba 100644
--- a/htdocs/always.php
+++ b/htdocs/always.php
@@ -143,8 +143,8 @@ if ( !isset($c->page_title) ) $c->page_title = $c->system_name;
 if ( isset($_SERVER['HTTP_X_DAVICAL_TESTCASE']) ) {
   @dbg_error_log( 'LOG', '==========> Test case =%s=', $_SERVER['HTTP_X_DAVICAL_TESTCASE'] );
 }
-else if ( count($c->dbg) > 0 ) {
-  // Only log this if debugging of some sort is turned on, somewhere
+else if ( isset($c->dbg['script_start']) && $c->dbg['script_start'] ) {
+  // Only log this if more than a little debugging of some sort is turned on, somewhere
   @dbg_error_log( 'LOG', '==========> method =%s= =%s= =%s= =%s= =%s=',
          $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, $_SERVER['PATH_INFO'], $c->base_url, $c->base_directory );
 }
diff --git a/inc/always.php.in b/inc/always.php.in
index 4f8dc1ab..8b1d237e 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -143,8 +143,8 @@ if ( !isset($c->page_title) ) $c->page_title = $c->system_name;
 if ( isset($_SERVER['HTTP_X_DAVICAL_TESTCASE']) ) {
   @dbg_error_log( 'LOG', '==========> Test case =%s=', $_SERVER['HTTP_X_DAVICAL_TESTCASE'] );
 }
-else if ( count($c->dbg) > 0 ) {
-  // Only log this if debugging of some sort is turned on, somewhere
+else if ( isset($c->dbg['script_start']) && $c->dbg['script_start'] ) {
+  // Only log this if more than a little debugging of some sort is turned on, somewhere
   @dbg_error_log( 'LOG', '==========> method =%s= =%s= =%s= =%s= =%s=',
          $_SERVER['REQUEST_METHOD'], $c->protocol_server_port_script, $_SERVER['PATH_INFO'], $c->base_url, $c->base_directory );
 }