diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts
index 7d29baf70f0..cf3c1b8b61e 100644
--- a/extensions/git/src/ipc/ipcServer.ts
+++ b/extensions/git/src/ipc/ipcServer.ts
@@ -37,9 +37,9 @@ export async function createIPCServer(): Promise<IIPCServer> {
 
 	return new Promise((c, e) => {
 		try {
+			server.on('error', err => e(err));
 			server.listen(ipcHandlePath);
 			c(new IPCServer(server, ipcHandlePath));
-			server.on('error', err => e(err));
 		} catch (err) {
 			e(err);
 		}
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index 5f237b28858..35fbf87ddd3 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -47,9 +47,6 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 		env = Askpass.getDisabledEnv();
 	}
 
-	// TODO@joao remove
-	console.log(env);
-
 	const git = new Git({ gitPath: info.path, version: info.version, env });
 	const model = new Model(git, context.globalState, outputChannel);
 	disposables.push(model);