diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb
index 5146ccb..dba36a9 100644
--- a/lib/redmine/hook.rb
+++ b/lib/redmine/hook.rb
@@ -140,7 +140,9 @@ module Redmine
           default_context = {:controller => self, :project => @project, :request => request}
           Redmine::Hook.call_hook(hook, default_context.merge(context))
         else
-          default_context = {:controller => controller, :project => @project, :request => request}
+          default_context = { :project => @project }
+          default_context[:controller] = controller if respond_to?(:controller)
+          default_context[:request] = request if respond_to?(:request)
           Redmine::Hook.call_hook(hook, default_context.merge(context)).join(' ')
         end
       end