diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index 685443db7e..6bc398a665 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -209,6 +209,9 @@ def _ParseRevisionString(revision_string, repo_dictionary):
 
 def _UprevFromRevisionList(buildroot, revision_list):
   """Uprevs based on revision list."""
+  if not revision_list:
+    print >> sys.stderr, 'No packages found to uprev'
+    return
   package_str = ''
   commit_str = ''
   for package, revision in revision_list:
diff --git a/bin/cbuildbot_unittest.py b/bin/cbuildbot_unittest.py
index c0f3c1c7cd..d3c0500fc2 100755
--- a/bin/cbuildbot_unittest.py
+++ b/bin/cbuildbot_unittest.py
@@ -29,6 +29,7 @@ class CBuildBotTest(mox.MoxTestBase):
                        'cros' : ['chromos-base/libcros']
                       }
     self._test_string = "kernel.git@12345test cros.git@12333test"
+    self._test_string += " crosutils.git@blahblah"
     self._revision_file = 'test-revisions.pfq'
     self._test_parsed_string_array = [
                                       ['chromeos-base/kernel', '12345test'],