Merge branch 'master' into dispatcher

delivrance · delivrance · commit f57ff96ab34d · 2018-04-08T16:54:38.000+02:00
diff --git a/pyrogram/api/errors/error.py b/pyrogram/api/errors/error.py
@@ -33,7 +33,11 @@ class Error(Exception):
     MESSAGE = None
 
     def __init__(self, x: int or RpcError = None, query_type: type = None):
-        super().__init__("[{} {}]: {}".format(self.CODE, self.ID or self.NAME, self.MESSAGE.format(x=x)))
+        super().__init__("[{} {}]: {}".format(
+            self.CODE,
+            self.ID or self.NAME,
+            str(self) or self.MESSAGE.format(x=x)
+        ))
 
         try:
             self.x = int(x)
