diff --git a/src/Umbraco.Core/HashCodeCombiner.cs b/src/Umbraco.Core/HashCodeCombiner.cs
index be640d7cbf..087ed6a3e2 100644
--- a/src/Umbraco.Core/HashCodeCombiner.cs
+++ b/src/Umbraco.Core/HashCodeCombiner.cs
@@ -12,8 +12,8 @@ namespace Umbraco.Core
 	/// </summary>
 	/// <remarks>
 	/// .Net has a class the same as this: System.Web.Util.HashCodeCombiner and of course it works for all sorts of things
-	/// and is probably more stable in general, however we just need a quick easy class for this in order to create a unique
-	/// hash of plugins to see if they've changed.
+	/// which we've not included here as we just need a quick easy class for this in order to create a unique
+	/// hash of directories/files to see if they have changed.
 	/// </remarks>
 	internal class HashCodeCombiner
 	{
@@ -42,6 +42,10 @@ namespace Umbraco.Core
 
 		internal void AddFileSystemItem(FileSystemInfo f)
 		{
+			//if it doesn't exist, don't proceed.
+			if (!f.Exists)
+				return;
+
 			AddCaseInsensitiveString(f.FullName);
 			AddDateTime(f.CreationTimeUtc);
 			AddDateTime(f.LastWriteTimeUtc);
diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs
index e40b90fb64..65cf377e5f 100644
--- a/src/Umbraco.Core/PluginManager.cs
+++ b/src/Umbraco.Core/PluginManager.cs
@@ -167,9 +167,9 @@ namespace Umbraco.Core
 							//add the bin folder and everything in it
 							new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Bin)),
 							//add the app code folder and everything in it
-							new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Root + "/App_Code")),
+							new DirectoryInfo(IOHelper.MapPath("~/App_Code")),
 							//add the global.asax (the app domain also monitors this, if it changes will do a full restart)
-							new FileInfo(IOHelper.MapPath(SystemDirectories.Root + "/global.asax"))
+							new FileInfo(IOHelper.MapPath("~/global.asax"))
 						}
 					);
 				return _currentAssembliesHash;