From d5993a478342e691fc99f5640b2c17bf55dd24ab Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 10 Jul 2014 12:09:26 +1000
Subject: [PATCH] Backports fix from 7 for GetDimensions call to ensure the
 file exists

---
 src/Umbraco.Core/IO/UmbracoMediaFile.cs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/IO/UmbracoMediaFile.cs b/src/Umbraco.Core/IO/UmbracoMediaFile.cs
index 2c8021388a..7d91dd0176 100644
--- a/src/Umbraco.Core/IO/UmbracoMediaFile.cs
+++ b/src/Umbraco.Core/IO/UmbracoMediaFile.cs
@@ -133,14 +133,22 @@ namespace Umbraco.Core.IO
         {
             if (_size == null)
             {
-                EnsureFileSupportsResizing();
-
-                using (var fs = _fs.OpenFile(Path))
-                using (var image = Image.FromStream(fs))
+                if (_fs.FileExists(Path))
                 {
-                    var fileWidth = image.Width;
-                    var fileHeight = image.Height;
-                    _size = new Size(fileWidth, fileHeight);    
+                    EnsureFileSupportsResizing();
+
+                    using (var fs = _fs.OpenFile(Path))
+                    using (var image = Image.FromStream(fs))
+                    {
+
+                        var fileWidth = image.Width;
+                        var fileHeight = image.Height;
+                        _size = new Size(fileWidth, fileHeight);
+                    }
+                }
+                else
+                {
+                    _size = new Size(-1, -1);
                 }
             }
             return _size.Value;