diff --git a/application/Views/errors/html/error_exception.php b/application/Views/errors/html/error_exception.php
index 9da76cbbffac..527dbadeaa18 100644
--- a/application/Views/errors/html/error_exception.php
+++ b/application/Views/errors/html/error_exception.php
@@ -267,7 +267,6 @@
 
 				<?php $headers = $request->getHeaders(); ?>
 				<?php if (! empty($headers)) : ?>
-					<?php natsort($headers) ?>
 
 					<h3>Headers</h3>
 
@@ -280,10 +279,14 @@
 						</thead>
 						<tbody>
 						<?php foreach ($headers as $name => $value) : ?>
-							<tr>
-								<td><?= esc($name, 'html') ?></td>
-								<td><?= esc($request->getHeaderLine($name), 'html') ?></td>
-							</tr>
+							<?php if (empty($value)) continue; ?>
+							<?php if (! is_array($value)) { $value = [$value]; } ?>
+							<?php foreach ($value as $h) : ?>
+								<tr>
+									<td><?= esc($h->getName(), 'html') ?></td>
+									<td><?= esc($h->getValueLine(), 'html') ?></td>
+								</tr>
+							<?php endforeach; ?>
 						<?php endforeach; ?>
 						</tbody>
 					</table>
@@ -321,7 +324,7 @@
 						<?php foreach ($headers as $name => $value) : ?>
 							<tr>
 								<td><?= esc($name, 'html') ?></td>
-								<td><?= esc($request->getHeaderLine($name), 'html') ?></td>
+								<td><?= esc($response->getHeaderLine($name), 'html') ?></td>
 							</tr>
 						<?php endforeach; ?>
 						</tbody>