diff --git a/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs b/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs
index c1b5b88643..c1c2186171 100644
--- a/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs
+++ b/src/Umbraco.Web/Mvc/DisableBrowserCacheAttribute.cs
@@ -13,6 +13,13 @@ namespace Umbraco.Web.Mvc
         {
             base.OnActionExecuted(filterContext);
 
+            // could happens if exception (but afaik this wouldn't happen in MVC)
+            if (filterContext.HttpContext == null || filterContext.HttpContext.Response == null ||
+                    filterContext.HttpContext.Response.Cache == null)
+            {
+                return;
+            }
+
             filterContext.HttpContext.Response.Cache.SetCacheability(HttpCacheability.NoCache);            
             filterContext.HttpContext.Response.Cache.SetMaxAge(TimeSpan.Zero);            
             filterContext.HttpContext.Response.Cache.SetRevalidation(HttpCacheRevalidation.AllCaches);
diff --git a/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs b/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
index 0bb283bd1a..3deddde831 100644
--- a/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
@@ -16,7 +16,11 @@ namespace Umbraco.Web.WebApi.Filters
             base.OnActionExecuted(actionExecutedContext);
 
             // happens if exception
-            if (actionExecutedContext.Response == null) return;
+            if (actionExecutedContext == null || actionExecutedContext.Response == null ||
+                    actionExecutedContext.Response.Headers == null)
+            {
+                return;
+            }
 
             //NOTE: Until we upgraded to WebApi 2, this didn't work correctly and we had to revert to using
             // HttpContext.Current responses. I've changed this back to what it should be now since it works