diff --git a/app/models/polymorphic/task.rb b/app/models/polymorphic/task.rb
index d3d5c32ccf..7cdb24d67e 100644
--- a/app/models/polymorphic/task.rb
+++ b/app/models/polymorphic/task.rb
@@ -189,6 +189,7 @@ def self.find_all_grouped(user, view)
   #----------------------------------------------------------------------------
   def self.bucket_empty?(bucket, user, view = "pending")
     return false if bucket.blank? || !ALLOWED_VIEWS.include?(view)
+    return false unless Setting.task_bucket.map(&:to_s).include?(bucket.to_s)
 
     if view == "assigned"
       assigned_by(user).send(bucket).pending.count
diff --git a/lib/fat_free_crm/version.rb b/lib/fat_free_crm/version.rb
index 4e2407513f..888a2ec146 100644
--- a/lib/fat_free_crm/version.rb
+++ b/lib/fat_free_crm/version.rb
@@ -9,7 +9,7 @@ module FatFreeCRM
   module VERSION # :nodoc:
     MAJOR = 0
     MINOR = 20
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')