diff --git a/lib/Xmds/Soap.php b/lib/Xmds/Soap.php
index 396c2479dc..7c13a99836 100644
--- a/lib/Xmds/Soap.php
+++ b/lib/Xmds/Soap.php
@@ -1094,8 +1094,12 @@ protected function doRequiredFiles(
 
                 // Add to paths added
                 $pathsAdded[] = $layoutId;
+            } catch (NotFoundException) {
+                $this->getLog()->error('Layout not found - ID: ' . $layoutId . ', skipping');
+                continue;
             } catch (GeneralException $e) {
-                $this->getLog()->error('Layout not found - ID: ' . $layoutId . ', skipping.');
+                $this->getLog()->error('Cannot generate layout - ID: ' . $layoutId
+                    . ', skipping, e = ' . $e->getMessage());
                 continue;
             }
         }
diff --git a/modules/assets/forecastio/elements/vector_backgrounds/windy.png b/modules/assets/forecastio/elements/vector_backgrounds/vector-windy.png
similarity index 100%
rename from modules/assets/forecastio/elements/vector_backgrounds/windy.png
rename to modules/assets/forecastio/elements/vector_backgrounds/vector-windy.png