diff --git a/.eslintrc.js b/.eslintrc.js
index ba34bc3c..848cda54 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -330,11 +330,11 @@ module.exports = {
     "no-constant-condition": [ 2, { "checkLoops": false } ],
 
     // Custom warnings:
-    "no-console": 0,
+    "no-console": 1,
     "no-unused-vars": 1,
-    "indent": [ 0, 2, { "SwitchCase": 1 } ],
 
     // TODO Consider fixing these:
+    "indent": [ 0, 2, { "SwitchCase": 1 } ],
     "valid-jsdoc": 0,
     "new-cap": [ 0, { "properties": false, "capIsNewExceptionPattern": "^type_.*" }],
     "no-lonely-if": 0,
diff --git a/src/encoding/armor.js b/src/encoding/armor.js
index 92b58923..24298528 100644
--- a/src/encoding/armor.js
+++ b/src/encoding/armor.js
@@ -19,12 +19,14 @@
  * @requires encoding/base64
  * @requires enums
  * @requires config
+ * @requires util
  * @module encoding/armor
  */
 
 import base64 from './base64.js';
 import enums from '../enums.js';
 import config from '../config';
+import util from '../util';
 
 /**
  * Finds out which Ascii Armoring type is used. Throws error if unknown type.
@@ -219,8 +221,8 @@ function verifyHeaders(headers) {
     if (!/^([^\s:]|[^\s:][^:]*[^\s:]): .+$/.test(headers[i])) {
       throw new Error('Improperly formatted armor header: ' + headers[i]);
     }
-    if (config.debug && !/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) {
-      console.log('Unknown header: ' + headers[i]);
+    if (!/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) {
+      util.print_debug_error(new Error('Unknown header: ' + headers[i]));
     }
   }
 }
diff --git a/src/util.js b/src/util.js
index c03c7dab..fbdc65d5 100644
--- a/src/util.js
+++ b/src/util.js
@@ -15,6 +15,8 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+/* eslint-disable no-console */
+
 /**
  * This object contains utility functions
  * @requires config