diff --git a/src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs b/src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
index e7f5d17b83..0e98cd5318 100644
--- a/src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
+++ b/src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
@@ -154,7 +154,7 @@ namespace Umbraco.Core.Cache
 
             value = result.Value; // will not throw (safe lazy)
             var eh = value as ExceptionHolder;
-            if (eh != null) throw eh.Exception; // throw once!
+            if (eh != null) throw new Exception("Exception while creating a value.", eh.Exception); // throw once!
             return value;
         }
 
diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index 257416d054..45873c3c74 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Core.Services
                         case UmbracoObjectTypes.ROOT:
                         case UmbracoObjectTypes.Unknown:
                         default:
-                            throw new NotSupportedException();
+                            throw new NotSupportedException("Unsupported object type (" + umbracoObjectType + ").");
                     }
                 }
             });