Merge branch '3.x-dev' into 4.x-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index 0dfa3d03e3..4ffc45cc96 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -11,6 +11,7 @@ namespace Piwik\Plugins\Proxy;
 use Piwik\AssetManager;
 use Piwik\AssetManager\UIAsset;
 use Piwik\Common;
+use Piwik\Exception\StylesheetLessCompileException;
 use Piwik\Piwik;
 use Piwik\ProxyHttp;
 use Piwik\Url;
@@ -33,7 +34,11 @@ class Controller extends \Piwik\Plugin\Controller
      */
     public function getCss()
     {
-        $cssMergedFile = AssetManager::getInstance()->getMergedStylesheet();
+        try {
+            $cssMergedFile = AssetManager::getInstance()->getMergedStylesheet();
+        } catch (StylesheetLessCompileException $exception) {
+            $cssMergedFile = AssetManager::getInstance()->getMergedStylesheet();
+        }
         ProxyHttp::serverStaticFile($cssMergedFile->getAbsoluteLocation(), "text/css");
     }