diff --git a/upload/system/engine/controller.php b/upload/system/engine/controller.php
index 68c514ffc..ec0dd8696 100644
--- a/upload/system/engine/controller.php
+++ b/upload/system/engine/controller.php
@@ -12,7 +12,7 @@
 /**
  * Class Controller
  *
- * @mixin Registry
+ * @mixin \Registry
  */
 class Controller {
 	/**
diff --git a/upload/system/engine/event.php b/upload/system/engine/event.php
index b0c243f22..a87fadc73 100644
--- a/upload/system/engine/event.php
+++ b/upload/system/engine/event.php
@@ -14,6 +14,8 @@
  *
  * Event System Userguide
  * https://github.com/opencart/opencart/wiki/Events-(script-notifications)-2.2.x.x
+ * 
+ * @mixin \Registry
  */
 class Event {
 	/**
diff --git a/upload/system/engine/loader.php b/upload/system/engine/loader.php
index 4e228d148..90932f72f 100644
--- a/upload/system/engine/loader.php
+++ b/upload/system/engine/loader.php
@@ -16,7 +16,7 @@
  */
 class Loader {
 	/**
-	 * @var object
+	 * @var object $registry
 	 */
 	protected object $registry;
 
diff --git a/upload/system/engine/proxy.php b/upload/system/engine/proxy.php
index ab5a16c1a..f71d5455f 100644
--- a/upload/system/engine/proxy.php
+++ b/upload/system/engine/proxy.php
@@ -12,7 +12,7 @@
 /**
  * Class Proxy
  *
- * @template TWraps of Model
+ * @template TWraps of \Model
  *
  * @mixin TWraps
  */
@@ -23,7 +23,7 @@ class Proxy {
 	protected array $data = [];
 
 	/**
-	 * Get
+	 * __get
 	 *
 	 * @param mixed $key
 	 *
@@ -34,7 +34,7 @@ public function __get($key) {
 	}
 
 	/**
-	 * Set
+	 * __set
 	 *
 	 * @param string $key
 	 * @param object $value
@@ -46,10 +46,10 @@ public function __set(string $key, object $value): void {
 	}
 
 	/**
-	 * Call
+	 * __call
 	 *
 	 * @param string              $key
-	 * @param mixed               $args
+	 * @param array               $args
 	 *
 	 * @return mixed
 	 */
@@ -67,7 +67,7 @@ public function __call(string $key, $args) {
 		} else {
 			$trace = debug_backtrace();
 
-			exit('<b>Notice</b>:  Undefined property: Proxy::' . $key . ' in <b>' . $trace[1]['file'] . '</b> on line <b>' . $trace[1]['line'] . '</b>');
+			throw new \Exception('<b>Notice</b>:  Undefined property: Proxy::' . $key . ' in <b>' . $trace[1]['file'] . '</b> on line <b>' . $trace[1]['line'] . '</b>');
 		}
 	}
 }
diff --git a/upload/system/engine/router.php b/upload/system/engine/router.php
index 383412dea..8dc6e4659 100644
--- a/upload/system/engine/router.php
+++ b/upload/system/engine/router.php
@@ -13,7 +13,13 @@
  * Class Router
  */
 class Router {
+	/**
+	 * @var object $registry
+	 */
 	private object $registry;
+	/**
+	 * @var array<string, mixed> $pre_action
+	 */
 	private array $pre_action = [];
 	private $error;