diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 016146a5c61..deecdf2c1c8 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -281,7 +281,8 @@ func (hs *HTTPServer) PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand)
 		aclService := dashboards.NewAclService()
 		err := aclService.MakeUserAdmin(cmd.OrgId, cmd.UserId, dashboard.Id)
 		if err != nil {
-			hs.log.Error("Could not make user admin", "error", err)
+			hs.log.Error("Could not make user admin", "dashboard", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
+			return Error(500, "Failed to make user admin of dashboard", err)
 		}
 	}
 
diff --git a/pkg/api/folder.go b/pkg/api/folder.go
index 4e66439219d..a2d6a765b16 100644
--- a/pkg/api/folder.go
+++ b/pkg/api/folder.go
@@ -63,7 +63,10 @@ func (hs *HTTPServer) CreateFolder(c *m.ReqContext, cmd m.CreateFolderCommand) R
 
 	if hs.Cfg.EditorsCanOwn {
 		aclService := dashboards.NewAclService()
-		aclService.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id)
+		if err := aclService.MakeUserAdmin(c.OrgId, c.SignedInUser.UserId, cmd.Result.Id); err != nil {
+			hs.log.Error("Could not make user admin", "folder", cmd.Result.Title, "user", c.SignedInUser.UserId, "error", err)
+			return Error(500, "Failed to make user admin of folder", err)
+		}
 	}
 
 	g := guardian.New(cmd.Result.Id, c.OrgId, c.SignedInUser)