diff --git a/includes/views/nodequeue_handler_relationship_nodequeue.inc b/includes/views/nodequeue_handler_relationship_nodequeue.inc
index a06674708d225d46d0d73b8ac5e2dce1eb799f56..db73757398bf098eba7dd98483b33f74514107d7 100644
--- a/includes/views/nodequeue_handler_relationship_nodequeue.inc
+++ b/includes/views/nodequeue_handler_relationship_nodequeue.inc
@@ -52,6 +52,19 @@ class nodequeue_handler_relationship_nodequeue extends views_handler_relationshi
     );
   }
 
+  /**
+   * Validate the options form.
+   */
+  function options_validate(&$form, &$form_state) {
+    parent::options_validate($form, $form_state);
+
+    // Check that at least on queue has been selected.
+    $options = $form_state['values']['options'];
+    if($options['limit'] && empty($options['queues'])) {
+      form_set_error('queues', t('You must check at least one queue.'));
+    }
+  }
+
   /**
    * Called to implement a relationship in a query.
    */