diff --git a/CHANGES.md b/CHANGES.md
index dce7330..e508e6a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,20 +8,19 @@ Known issues:
 
 ## bunyan 0.22.1 (not yet released)
 
-(nothing yet)
+- #101 Fix a crash in `bunyan` rendering a record with unexpected "res.headers".s
 
 
 ## bunyan 0.22.0
 
-- [issue #104] `log.reopenFileStreams()` convenience method to be used with
-  external log rotation.
+- #104 `log.reopenFileStreams()` convenience method to be used with external log
+  rotation.
 
 
 ## bunyan 0.21.4
 
-- [issue #96] Fix `bunyan` to default to paging (with `less`) by default in
-  node 0.10.0. The intention has always been to default to paging for node
-  >=0.8.
+- #96 Fix `bunyan` to default to paging (with `less`) by default in node 0.10.0.
+  The intention has always been to default to paging for node >=0.8.
 
 
 ## bunyan 0.21.3
diff --git a/bin/bunyan b/bin/bunyan
index 3811d15..ccff62a 100755
--- a/bin/bunyan
+++ b/bin/bunyan
@@ -834,6 +834,8 @@ function emitRecord(rec, line, opts, stylize) {
             var s = '';
             if (res.header) {
                 s += res.header.trimRight();
+            } else if (typeof(res.headers) === 'string') {
+                s += res.headers.trimRight();
             } else if (res.headers) {
                 if (res.statusCode) {
                     s += format('HTTP/1.1 %s %s\n', res.statusCode,