diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index c8eb81c6d..366d2b403 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -379,7 +379,7 @@ class Controller extends Extendable
                 return Response::make(Lang::get('backend::lang.model.mass_assignment_failed', ['attribute' => $ex->getMessage()]), 500);
             }
             catch (Exception $ex) {
-                return Response::make($ex->getMessage(), 500);
+                return Response::make(sprintf('"%s" on line %s of %s', $ex->getMessage(), $ex->getLine(), $ex->getFile()), 500);
             }
         }
 
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 669d636a5..cbff8d117 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -8,7 +8,7 @@ use System\Classes\ApplicationException;
  *
  * Usage:
  *
- * In the model class definition: 
+ * In the model class definition:
  *
  *   public $implement = ['System.Behaviors.SettingsModel'];
  *   public $settingsCode = 'author_plugin_code';
@@ -200,4 +200,4 @@ class SettingsModel extends ModelBehavior
     {
         return $this->fieldConfig;
     }
-} 
+}