diff --git a/src/vs/workbench/parts/git/node/git.lib.ts b/src/vs/workbench/parts/git/node/git.lib.ts
index ed8acd900bf5fe141b0ef9caf73771e9eeaad8bd..c742d20c6ff92eed594bd8409bdef192dc94ef13 100644
--- a/src/vs/workbench/parts/git/node/git.lib.ts
+++ b/src/vs/workbench/parts/git/node/git.lib.ts
@@ -334,6 +334,10 @@ export class Repository {
 	buffer(object: string): TPromise<string> {
 		const child = this.show(object);
 
+		if (!child.stdout) {
+			return TPromise.wrapError(localize('errorBuffer', "Can't open file from git"));
+		}
+
 		return new Promise((c, e) => {
 			detectMimesFromStream(child.stdout, null, (err, result) => {
 				if (err) {