diff --git a/grader b/grader
--- a/grader
+++ b/grader
@@ -98,12 +98,14 @@
 current_dir = `pwd`
 
 talk 'Grader queue'
-task = Task.find(:first, :order => 'created_at')
-if task!=nil 
-  grade(task.submission_id)
-  task.destroy
-else
-  puts "No job"
+while true
+  task = Task.find(:first, :order => 'created_at')
+  if task!=nil 
+    grade(task.submission_id)
+    task.destroy
+  else
+    sleep(1)
+  end
 end