diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index 8d8b76e..ce218be 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -14,6 +14,10 @@ class AnnouncementsController < ApplicationController
   def index
     Bulletin.remove_expired_status
     sorted,total_pages = get_sorted_annc
+    if sorted.nil?
+      sorted = []
+      total_pages = 0
+    end
     anns = sorted.collect do |a|
       if a["source-site"].blank?
         statuses = a.statuses_with_classname.collect do |status|
@@ -461,7 +465,7 @@ class AnnouncementsController < ApplicationController
     widget_data_count = OrbitHelper.widget_data_count
     anns_cache = AnnsCache.where(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s)
     devide_flag = (!(defined? SiteFeed).nil?)
-    anns_cache.where(:invalid_date.lte => Time.now).destroy
+    anns_cache.where(:invalid_date.ne=>nil).where(:invalid_date.lte => Time.now).destroy
     count = anns_cache.count
     if count > 1
       anns_cache.limit(count-1).destroy