diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index ac2741b9..621fc9e8 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -643,7 +643,7 @@ gam course <CourseID> delete alias <CourseAlias>
 gam course <CourseID> add teachers|students <UserItem>
 gam course <CourseID> delete|remove teachers|students <UserItem>
 gam course <CourseID> sync teachers|students <UserTypeEntity>
-gam print course-participants [todrive](course <CourseID>)* [teacher] [student] [show all|students|teachers]
+gam print course-participants [todrive] (course|class <CourseID>)*|([teacher <UserItem>] [student <UserItem>]) [show all|students|teachers]
 
 gam create guardian|guardianinvite|inviteguardian <EmailAddress> <UserItem>
 gam delete guardian|guardians <GuardianID <UserItem>
diff --git a/src/gam.py b/src/gam.py
index c3142835..304217a8 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -2529,8 +2529,8 @@ def doPrintCourseParticipants():
     else:
       print u'ERROR: %s is not a valid argument for "gam print course-participants"' % sys.argv[i]
       sys.exit(2)
-    sys.stderr.write(u'Retrieving courses for organization (may take some time for large accounts)...\n')
   if len(courses) == 0:
+    sys.stderr.write(u'Retrieving courses for organization (may take some time for large accounts)...\n')
     page_message = u'Got %%num_items%% courses...\n'
     all_courses = callGAPIpages(croom.courses(), u'list', u'courses', page_message=page_message, teacherId=teacherId, studentId=studentId)
     for course in all_courses: