diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 44466f4d3ae..a6e3a74df0a 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6563,3 +6563,9 @@ ER_NO_SUCH_QUERY
         eng "Unknown query id: %lld"
         ger "Unbekannte Abfrage-ID: %lld"
         rus "Неизвестный номер запроса: %lld"
+ER_INVALID_ROLE
+	eng "The role '%s' has not been granted or is invalid."
+	rum "Rolul '%s' este invalid sau nu a fost acordat."
+ER_INVALID_CURRENT_USER
+	eng "The current user is invalid."
+	rum "Utilizatorul curent este invalid."
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index b7e9f3f97fb..6704d28ae89 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1689,7 +1689,10 @@ bool acl_setrole(THD *thd, char *rolename)
     acl_user= find_acl_user(thd->security_ctx->host, thd->security_ctx->user,
                              FALSE);
     if (acl_user == NULL)
+    {
+      my_error(ER_INVALID_CURRENT_USER, MYF(0), rolename);
       result= -1;
+    }
     else
       thd->security_ctx->master_access= acl_user->access;
 
@@ -1697,6 +1700,7 @@ bool acl_setrole(THD *thd, char *rolename)
   }
 
   if (role == NULL) {
+    my_error(ER_INVALID_ROLE, MYF(0), rolename);
     result= -1;
     goto end;
   }
@@ -1719,6 +1723,7 @@ bool acl_setrole(THD *thd, char *rolename)
 
   if (!is_granted)
   {
+    my_error(ER_INVALID_ROLE, MYF(0), rolename);
     result= 1;
     goto end;
   }