1 files changed, 6 insertions, 2 deletions

diff --git a/command.py b/command.py
index 939a4630..d2129381 100644
--- a/command.py
+++ b/command.py
@@ -16,11 +16,11 @@ import multiprocessing
 import os
 import optparse
 import re
-import sys
 
 from event_log import EventLog
 from error import NoSuchProjectError
 from error import InvalidProjectGroupsError
+from error import RepoExitError
 import progress
 
 
@@ -42,6 +42,10 @@ WORKER_BATCH_SIZE = 32
 DEFAULT_LOCAL_JOBS = min(os.cpu_count(), 8)
 
 
+class UsageError(RepoExitError):
+    """Exception thrown with invalid command usage."""
+
+
 class Command(object):
     """Base class for any command line action in repo."""
 
@@ -215,7 +219,7 @@ class Command(object):
     def Usage(self):
         """Display usage and terminate."""
         self.OptionParser.print_usage()
-        sys.exit(1)
+        raise UsageError()
 
     def CommonValidateOptions(self, opt, args):
         """Validate common options."""