diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 399065aa..cb3aca90 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -2,7 +2,9 @@ export {
     MemoryStorage,
     JsonFileStorage,
     LocalstorageStorage,
+    tl
 } from '@mtcute/core'
+export * from '@mtcute/tl/errors'
 
 export * from './parser'
 export * from './types'
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 7dc1167a..eb17eb59 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -3,6 +3,9 @@ export * from './network'
 export * from './storage'
 export * from './types'
 
+export * from '@mtcute/tl'
+export * from '@mtcute/tl/errors'
+
 export * from './utils/crypto'
 export * from './utils/peer-utils'
 export * from './utils/tl-json'
diff --git a/packages/node/index.ts b/packages/node/index.ts
index 1740f6f5..687a4750 100644
--- a/packages/node/index.ts
+++ b/packages/node/index.ts
@@ -7,6 +7,7 @@ import { SqliteStorage } from '@mtcute/sqlite'
 import { createInterface, Interface as RlInterface } from 'readline'
 
 export * from '@mtcute/dispatcher'
+export * from '@mtcute/client'
 export { SqliteStorage }
 
 let nativeCrypto: typeof NodeNativeCryptoProvider | null
diff --git a/packages/tl/scripts/generate-errors.js b/packages/tl/scripts/generate-errors.js
index 3764539c..a6f1e0ed 100644
--- a/packages/tl/scripts/generate-errors.js
+++ b/packages/tl/scripts/generate-errors.js
@@ -64,7 +64,7 @@ const baseErrors = [
         description:
             'An internal server error occurred while a request was being processed; ' +
             'for example, there was a disruption while accessing a database or file storage.',
-    },
+    }
 ]
 
 const inheritanceTable = {
@@ -83,7 +83,7 @@ const customErrors = [
         virtual: true,
         name: 'RPC_TIMEOUT',
         codes: '408',
-        description: 'Timeout of {ms} ms exceeded'
+        description: 'Timeout of {ms} ms exceeded',
     }
 ]
 
@@ -124,7 +124,10 @@ export declare class RpcError extends Error {
     baseErrors.forEach((it) => (it.base = true))
     const allErrors = [...baseErrors, ...csv]
 
-    fs.writeFileSync(path.join(__dirname, '../raw-errors.json'), JSON.stringify(allErrors))
+    fs.writeFileSync(
+        path.join(__dirname, '../raw-errors.json'),
+        JSON.stringify(allErrors)
+    )
 
     allErrors.forEach((err) => {
         let hasArgument =
@@ -194,12 +197,21 @@ exports.${className} = ${className}`)
 
     js.write('const _staticNameErrors = {')
     js.tab()
-    csv.filter((i) => !i.virtual && !i.name.match(/_X_|_X$|^X_/)).forEach((err) =>
-        js.write(`'${err.name}': ${err.fclsname},`)
-    )
+    csv.filter(
+        (i) => !i.virtual && !i.name.match(/_X_|_X$|^X_/)
+    ).forEach((err) => js.write(`'${err.name}': ${err.fclsname},`))
     js.write(`'Timeout': TimeoutError,`)
     js.untab()
     js.write('};')
+
+    js.write('const _baseCodeErrors = {')
+    js.tab()
+    Object.entries(inheritanceTable).forEach(([code, error]) => {
+        js.write(`${code}: ${error},`)
+    })
+    js.untab()
+    js.write('};')
+
     js.write(`exports.createRpcErrorFromTl = function (obj) {
     if (obj.errorMessage in _staticNameErrors) return new _staticNameErrors[obj.errorMessage]();
 
@@ -215,6 +227,8 @@ ${allErrors
     )
     .join('\n')}
 
+   if (obj.errorCode in _baseCodeErrors) return new _baseCodeErrors[obj.errorCode](obj.errorMessage);
+
     return new RpcError(obj.errorCode, obj.errorMessage);
 }`)
 }