diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index a47c66d..b9aa5c8 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -1,6 +1,6 @@
 class SearchController < ApplicationController  
   def index
-    @query = params[:query]
+    @query = params[:query] || ''
     @results = Article.find_tagged_with(@query) + Article.find_by_contents(@query)
   end
 end
--
libgit2 0.21.2