diff --git a/include/errors/class_SimplePluginError.inc b/include/errors/class_SimplePluginError.inc
index 3fdf05a8865176095cd1cfc99898c3003928a8e0..6fbccc78c35dfb1b9f19692581c71563e99f47a4 100644
--- a/include/errors/class_SimplePluginError.inc
+++ b/include/errors/class_SimplePluginError.inc
@@ -48,7 +48,7 @@ class SimplePluginError extends FusionDirectoryError
       } elseif ($origin instanceof simpleTabs) {
         $this->tab    = NULL;
         $this->object = $origin;
-      } else {
+      } elseif ($origin !== NULL) {
         trigger_error('Invalid origin of class '.get_class($origin));
       }
     }
diff --git a/include/errors/class_SimplePluginHookError.inc b/include/errors/class_SimplePluginHookError.inc
index d235cb19445fc65bb739fcea0248316666785f1a..86f35c889e016794ce7d0a6fda6a6788814a721a 100644
--- a/include/errors/class_SimplePluginHookError.inc
+++ b/include/errors/class_SimplePluginHookError.inc
@@ -29,7 +29,7 @@ class SimplePluginHookError extends SimplePluginError
   {
     $this->hookType = $type;
 
-    parent::__construct($origin, '<pre><samp>'.htmlescape($output).'</samp></pre>', $code, $previous);
+    parent::__construct($origin, nl2br('<samp>'.htmlescape($output).'</samp>'), $code, $previous);
   }
 
   public function toArray (): array