diff --git a/templates/Error/error400.php b/templates/Error/error400.php
index 68c0e63418..9ead1656c8 100644
--- a/templates/Error/error400.php
+++ b/templates/Error/error400.php
@@ -25,13 +25,14 @@
     </p>
 <?php endif; ?>
 <?php if (!empty($error->params)) : ?>
-        <strong>SQL Query Params: </strong>
-        <?php Debugger::dump($error->params) ?>
+    <strong>SQL Query Params: </strong>
+    <?php Debugger::dump($error->params) ?>
 <?php endif; ?>
-<?= $this->element('auto_table_warning') ?>
+
 <?php
+    echo $this->element('auto_table_warning');
 
-$this->end();
+    $this->end();
 endif;
 ?>
 <h2><?= h($message) ?></h2>
diff --git a/templates/Error/error500.php b/templates/Error/error500.php
index 0295c760d8..4f08488e90 100644
--- a/templates/Error/error500.php
+++ b/templates/Error/error500.php
@@ -29,8 +29,10 @@
     <?php Debugger::dump($error->params) ?>
 <?php endif; ?>
 <?php if ($error instanceof Error) : ?>
+    <?php $file = $error->getFile() ?>
+    <?php $line = $error->getLine() ?>
     <strong>Error in: </strong>
-    <?= sprintf('%s, line %s', str_replace(ROOT, 'ROOT', $error->getFile()), $error->getLine()) ?>
+    <?= $this->Html->link(sprintf('%s, line %s', Debugger::trimPath($file), $line), Debugger::editorUrl($file, $line)); ?>
 <?php endif; ?>
 <?php
     echo $this->element('auto_table_warning');