diff --git a/lib/Minify.php b/lib/Minify.php
index d8b7fac3..f6f1cb1e 100644
--- a/lib/Minify.php
+++ b/lib/Minify.php
@@ -471,7 +471,7 @@ public function combine($sources, $options = array())
      */
     public function errorExit($header, $url = '', $msgHtml = '')
     {
-        $url = htmlspecialchars($url, ENT_QUOTES);
+        $url = htmlspecialchars($url);
         list(, $h1) = explode(' ', $header, 2);
         $h1 = htmlspecialchars($h1);
         // FastCGI environments require 3rd arg to header() to be set
diff --git a/lib/Minify/HTML/Helper.php b/lib/Minify/HTML/Helper.php
index bfded8b3..28455c27 100644
--- a/lib/Minify/HTML/Helper.php
+++ b/lib/Minify/HTML/Helper.php
@@ -52,7 +52,7 @@ public static function getUri($keyOrFiles, $opts = array())
         }
         $uri = $h->getRawUri($opts['farExpires'], $opts['debug']);
 
-        return htmlspecialchars($uri, ENT_QUOTES, $opts['charset']);
+        return htmlspecialchars($uri, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401, $opts['charset']);
     }
 
     /**