diff --git a/types/nodegit/error.d.ts b/types/nodegit/error.d.ts
new file mode 100644
index 0000000000..e1267c082b
--- /dev/null
+++ b/types/nodegit/error.d.ts
@@ -0,0 +1,68 @@
+export namespace Error {
+    enum ERROR {
+        GITERR_NONE = 0,
+        GITERR_NOMEMORY = 1,
+        GITERR_OS = 2,
+        GITERR_INVALID = 3,
+        GITERR_REFERENCE = 4,
+        GITERR_ZLIB = 5,
+        GITERR_REPOSITORY = 6,
+        GITERR_CONFIG = 7,
+        GITERR_REGEX = 8,
+        GITERR_ODB = 9,
+        GITERR_INDEX = 10,
+        GITERR_OBJECT = 11,
+        GITERR_NET = 12,
+        GITERR_TAG = 13,
+        GITERR_TREE = 14,
+        GITERR_INDEXER = 15,
+        GITERR_SSL = 16,
+        GITERR_SUBMODULE = 17,
+        GITERR_THREAD = 18,
+        GITERR_STASH = 19,
+        GITERR_CHECKOUT = 20,
+        GITERR_FETCHHEAD = 21,
+        GITERR_MERGE = 22,
+        GITERR_SSH = 23,
+        GITERR_FILTER = 24,
+        GITERR_REVERT = 25,
+        GITERR_CALLBACK = 26,
+        GITERR_CHERRYPICK = 27,
+        GITERR_DESCRIBE = 28,
+        GITERR_REBASE = 29,
+        GITERR_FILESYSTEM = 30
+    }
+
+    enum CODE {
+        OK = 0,
+        ERROR = -1,
+        ENOTFOUND = -3,
+        EEXISTS = -4,
+        EAMBIGUOUS = -5,
+        EBUFS = -6,
+        EUSER = -7,
+        EBAREREPO = -8,
+        EUNBORNBRANCH = -9,
+        EUNMERGED = -10,
+        ENONFASTFORWARD = -11,
+        EINVALIDSPEC = -12,
+        ECONFLICT = -13,
+        ELOCKED = -14,
+        EMODIFIED = -15,
+        EAUTH = -16,
+        ECERTIFICATE = -17,
+        EAPPLIED = -18,
+        EPEEL = -19,
+        EEOF = -20,
+        EINVALID = -21,
+        EUNCOMMITTED = -22,
+        EDIRECTORY = -23,
+        PASSTHROUGH = -30,
+        ITEROVER = -31
+    }
+}
+
+export class Error {
+    message: string;
+    klass: number;
+}
diff --git a/types/nodegit/git-err.d.ts b/types/nodegit/git-err.d.ts
index 5147e7fb3c..6a9da24bb3 100644
--- a/types/nodegit/git-err.d.ts
+++ b/types/nodegit/git-err.d.ts
@@ -1,6 +1,8 @@
+import { Error } from './error';
+
 export class Giterr {
     static errClear(): void;
-    static errDetach(cpy: NodeGit.Error): number;
+    static errDetach(cpy: Error): number;
     static errLast(): Error;
     static errSetOom(): void;
     static errSetString(error_class: number, string: string): void;
diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index 3a6aef1423..df1b2c1f20 100644
--- a/types/nodegit/index.d.ts
+++ b/types/nodegit/index.d.ts
@@ -15,6 +15,7 @@ export { DiffFile } from './diff-file';
 export { DiffPerfdata } from './diff-perf-data';
 export { Diff } from './diff';
 export { Enums } from './enums';
+export { Error } from './error';
 export { FetchOptions } from './fetch-options';
 export { Filter } from './filter';
 export { Giterr } from './git-err';
diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json
index 9ff8fdea93..21d56ac954 100644
--- a/types/nodegit/tsconfig.json
+++ b/types/nodegit/tsconfig.json
@@ -28,6 +28,7 @@
         "diff-perf-data.d.ts",
         "diff.d.ts",
         "enums.d.ts",
+        "error.d.ts",
         "fetch-options.d.ts",
         "filter.d.ts",
         "git-err.d.ts",