diff --git a/client/djrandom_client/client.py b/client/djrandom_client/client.py
index a3c425507f8539349fef11494ffad26702bd9af4..60edf963f67981f0e8201ce1285da41ca1427a79 100644
--- a/client/djrandom_client/client.py
+++ b/client/djrandom_client/client.py
@@ -75,6 +75,8 @@ def main():
     opts, args = parser.parse_args()
     if not opts.api_key:
         parser.error('You must specify an API Key')
+    if not os.path.isdir(opts.music_dir):
+        parser.error('The --music_dir you specified does not exist')
     if args:
         parser.error('Too many arguments')