diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb
index 7dd9916a..1eb38364 100644
--- a/app/models/dmsf_link.rb
+++ b/app/models/dmsf_link.rb
@@ -109,7 +109,7 @@ class DmsfLink < ActiveRecord::Base
       :dmsf_folder_id => folder ? folder.id : nil,
       :target_type => DmsfFile.model_name.to_s).visible.all
     links.each do |link|
-      return link if link.target_file.name == filename
+      return link if link.target_file && (link.target_file.name == filename)
     end
     nil
   end
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index 1f620a00..9e8e987e 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -290,7 +290,7 @@
   <%= content_tag(:label, l(:label_index_database)) %>
   <%= text_field_tag 'settings[dmsf_index_database]', @settings['dmsf_index_database'], :disabled => xapian_disabled, :size => 50 %>
   <em class="info">
-    <%= l(:label_default) %>: <%= "#{Rails.root}/files/dmsf_index" %>
+    <%= l(:label_default) %>: <%= File.expand_path('dmsf_index', Rails.root) %>
   </em>
 </p>
 
diff --git a/extra/xapian_indexer.rb b/extra/xapian_indexer.rb
index 8ab2677f..5e1607f5 100644
--- a/extra/xapian_indexer.rb
+++ b/extra/xapian_indexer.rb
@@ -29,7 +29,7 @@ require 'optparse'
 ########################################################################################################################
 
 # Redmine installation directory
-$redmine_root = '/opt/redmine'
+$redmine_root = File.expand_path('../../../../', __FILE__)
 
 # DMSF document location $redmine_root/$files
 $files = 'dmsf'
@@ -40,8 +40,8 @@ $scriptindex = '/usr/bin/scriptindex'
 # omindex binary path
 $omindex = '/usr/bin/omindex'
 
-# Directory containing xapian databases for omindex (Attachments indexing)
-$dbrootpath = '/var/tmp/dmsf-index'
+# Directory containing Xapian databases for omindex (Attachments indexing)
+$dbrootpath = File.expand_path('dmsf_index', $redmine_root)
 
 # Verbose output, values of 0 no verbose, greater than 0 verbose output
 $verbose = 0
diff --git a/init.rb b/init.rb
index 0b06eb86..7197da97 100644
--- a/init.rb
+++ b/init.rb
@@ -43,7 +43,7 @@ Redmine::Plugin.register :redmine_dmsf do
               'dmsf_max_email_filesize' => '0',
               'dmsf_max_ajax_upload_filesize' => '100',
               'dmsf_storage_directory' => 'files/dmsf',
-              'dmsf_index_database' => 'files/dmsf_index',
+              'dmsf_index_database' => File.expand_path('dmsf_index', Rails.root),
               'dmsf_stemming_lang' => 'english',
               'dmsf_stemming_strategy' => 'STEM_NONE',
               'dmsf_webdav' => '1',