diff --git a/modules/demo/src/Tests/TMGMTDemoTest.php b/modules/demo/src/Tests/TMGMTDemoTest.php
index c6572a6..118eeba 100644
--- a/modules/demo/src/Tests/TMGMTDemoTest.php
+++ b/modules/demo/src/Tests/TMGMTDemoTest.php
@@ -50,6 +50,9 @@ class TMGMTDemoTest extends TMGMTTestBase {
     $this->clickLink(t('Translate'));
     $this->drupalPostForm(NULL, $edit, t('Request translation'));
     $this->assertText(t('2 jobs need to be checked out.'));
+    // Check to see if no items are selected and the error message pops up.
+    $this->drupalPostForm('admin/tmgmt/sources', array(), t('Request translation'));
+    $this->assertUniqueText(t("You didn't select any source objects"));
   }
 
 }
diff --git a/src/Form/SourceOverviewForm.php b/src/Form/SourceOverviewForm.php
index 1ba364b..c9e122a 100644
--- a/src/Form/SourceOverviewForm.php
+++ b/src/Form/SourceOverviewForm.php
@@ -153,10 +153,15 @@ class SourceOverviewForm extends FormBase {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    /*if (!$form_state->getValue('values')) {
-      $form_state->setErrorByName('items', t("You didn't select any source objects"));
-    }*/
-    $plugin =  $form_state->get('plugin');
+    $items = array_filter($form_state->getValue('items'));
+    $is_search = FALSE;
+    if ($form_state->getValue('op') == t('Search')) {
+      $is_search = TRUE;
+    }
+    if (empty($items) && !$is_search) {
+      $form_state->setError($form, t("You didn't select any source objects"));
+    }
+    $plugin = $form_state->get('plugin');
     $item_type = $form_state->get('item_type');
     // Execute the validation method on the source plugin controller.
     $source_ui = $this->sourceManager->createUIInstance($plugin);