diff --git a/lib/src/git.dart b/lib/src/git.dart
index 510ca7eecd3819dea05246c6beea8e2e6edebfab..d79a914073e6d2c818b39718d9ae7350f96854c6 100644
--- a/lib/src/git.dart
+++ b/lib/src/git.dart
@@ -10,6 +10,7 @@ import 'dart:io';
 
 import 'io.dart';
 import 'log.dart' as log;
+import 'utils.dart';
 
 /// An exception thrown because a git command failed.
 class GitException implements Exception {
@@ -41,6 +42,12 @@ Future<bool> get isInstalled {
 Future<List<String>> run(List<String> args,
     {String workingDir, Map<String, String> environment}) {
   return _gitCommand.then((git) {
+    if (git == null) {
+      throw new ApplicationException(
+          "Cannot find a Git executable.\n"
+          "Please ensure Git is correctly installed.");
+    }
+
     return runProcess(git, args, workingDir: workingDir,
         environment: environment);
   }).then((result) {
diff --git a/lib/src/source/git.dart b/lib/src/source/git.dart
index c7329b29b785fd95adaeb731de26b92546197cef..b0488c4ebbe14d6413c5946fdb94f8ca3cc32fb3 100644
--- a/lib/src/source/git.dart
+++ b/lib/src/source/git.dart
@@ -53,7 +53,7 @@ class GitSource extends CachedSource {
 
     return git.isInstalled.then((installed) {
       if (!installed) {
-        throw new Exception(
+        throw new ApplicationException(
             "Cannot get ${id.name} from Git (${_getUrl(id)}).\n"
             "Please ensure Git is correctly installed.");
       }