diff --git a/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs b/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs
index 443e27ef13..17832642f8 100644
--- a/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs
+++ b/src/Umbraco.Web/Strategies/DataTypes/LegacyUploadFieldWorkaround.cs
@@ -57,6 +57,10 @@ namespace Umbraco.Web.Strategies.DataTypes
 			if (uploadFieldConfigNode != null)
 			{
 				var fileSystem = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+                //Ensure that the Property has a Value before continuing
+                if(property.Value == null)
+                    return;
+
 				var path = fileSystem.GetRelativePath(property.Value.ToString());
 
 				if (string.IsNullOrWhiteSpace(path) == false && fileSystem.FileExists(path))
diff --git a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
index 481b9b7cb0..f459d22e79 100644
--- a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
+++ b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
@@ -123,6 +123,9 @@ namespace umbraco.cms.businesslogic.datatype
 
         private void ClearRelatedValues()
         {
+            if(PropertyId == default(int))
+                return;
+
             string propertyTypeAlias = new Property(PropertyId).PropertyType.Alias;
             if (UmbracoSettings.ImageAutoFillImageProperties != null)
             {