JanDC
diff --git a/‎src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
Lines changed: 32 additions & 7 deletions b/‎src/Symfony/Component/Config/Exception/FileLoaderLoadException.php
Lines changed: 32 additions & 7 deletions
@@ -26,20 +26,45 @@ class FileLoaderLoadException extends \Exception
      */
     public function __construct($resource, $sourceResource = null, $code = null, $previous = null)
     {
-        if (null === $sourceResource) {
-            $message = sprintf('Cannot load resource "%s".', $this->varToString($resource));
+        $message = '';
+        if ($previous) {
+            // include the previous exception, to help the user see what might be the underlying cause
+            if ('.' === substr($previous->getMessage(), -1)) {
+                $trimmedMessage = substr($previous->getMessage(), 0, -1);
+                $message .= ' ' . sprintf('%s', $trimmedMessage) . ' in ';
+            } else {
+                $message .= ' ' . sprintf('%s', $previous->getMessage()) . ' in ';
+            }
+            $message .= $resource . '. ';
+            // show tweaked trace
+            if (null === $sourceResource) {
+                $message .= sprintf('(Which is loaded in resource "%s")', $this->varToString($resource));
+            } else {
+                $message .= sprintf(
+                    '(Which is being imported from "%s")',
+                    $this->varToString($sourceResource)
+                );
+            }
+
+            // if there's no previous message, present it the default way
+        } elseif (null === $sourceResource) {
+            $message .= sprintf('Cannot load resource "%s".', $this->varToString($resource));
         } else {
-            $message = sprintf('Cannot import resource "%s" from "%s".', $this->varToString($resource), $this->varToString($sourceResource));
+            $message .= sprintf(
+                'Cannot import resource "%s" from "%s".',
+                $this->varToString($resource),
+                $this->varToString($sourceResource)
+            );
         }
 
         // Is the resource located inside a bundle?
         if ('@' === $resource[0]) {
             $parts = explode(DIRECTORY_SEPARATOR, $resource);
             $bundle = substr($parts[0], 1);
-            $message .= ' '.sprintf('Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.', $bundle);
-        } elseif ($previous) {
-            // include the previous exception, to help the user see what might be the underlying cause
-            $message .= ' '.sprintf('(%s)', $previous->getMessage());
+            $message .= ' ' . sprintf(
+                    'Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.',
+                    $bundle
+                );
         }
 
         parent::__construct($message, $code, $previous);