diff --git a/lib/redmine_dmsf/hooks/views/base_view_hooks.rb b/lib/redmine_dmsf/hooks/views/base_view_hooks.rb
index fc5bcc4d..a8a6b956 100644
--- a/lib/redmine_dmsf/hooks/views/base_view_hooks.rb
+++ b/lib/redmine_dmsf/hooks/views/base_view_hooks.rb
@@ -24,7 +24,6 @@ module RedmineDmsf
 
     class DmsfViewListener < Redmine::Hook::ViewListener
 
-      # TODO: *.css are twice there
       def view_layouts_base_html_head(context={})
         return unless /^(Dmsf|Projects)/.match?(context[:controller].class.name)
         meta = "\n".html_safe + stylesheet_link_tag('redmine_dmsf.css', plugin: :redmine_dmsf) +
diff --git a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
index d8758cd4..b30c9e7d 100644
--- a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
+++ b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
@@ -121,7 +121,7 @@ module RedmineDmsf
         unless defined?(EasyExtensions)
           true
         end
-        container.project && container.project.module_enabled?(:documents)
+        container && container.project && container.project.module_enabled?(:documents)
       end
 
       def get_links(container)