diff --git a/UnhandledHandler.php b/UnhandledHandler.php
index 1bdd1065a..546d415c1 100644
--- a/UnhandledHandler.php
+++ b/UnhandledHandler.php
@@ -36,7 +36,7 @@ final class UnhandledHandler
      *
      * @since  1.0.0
      */
-    public static function exceptionHandler($e) /* : void */
+    public static function exceptionHandler(\Throwable $e) /* : void */
     {
         $logger = FileLogger::getInstance(__DIR__ . '/../Logs');
         $logger->critical(FileLogger::MSG_FULL, [
@@ -103,6 +103,8 @@ final class UnhandledHandler
 
     /**
      * Shutdown handler.
+     * 
+     * @return void
      *
      * @since  1.0.0
      */
diff --git a/Uri/UriFactory.php b/Uri/UriFactory.php
index d610df9b3..5c1a6d91d 100644
--- a/Uri/UriFactory.php
+++ b/Uri/UriFactory.php
@@ -197,7 +197,7 @@ class UriFactory
                 $pars[] = $key . '=' . $value;
             }
 
-            return $parts[0] . (empty($pars) ? '' : '?' . implode('&', $pars));
+            $url = $parts[0] . (empty($pars) ? '' : '?' . implode('&', $pars));
         }
 
         return $url;