diff --git a/lib/redmine_dmsf/webdav/controller.rb b/lib/redmine_dmsf/webdav/controller.rb
index e5d80ecc..e497b29c 100644
--- a/lib/redmine_dmsf/webdav/controller.rb
+++ b/lib/redmine_dmsf/webdav/controller.rb
@@ -22,6 +22,7 @@ module RedmineDmsf
 
       #Overload default options
       def options
+        raise NotFound unless resource.exist?
         response["Allow"] = 'OPTIONS,HEAD,GET,PUT,POST,DELETE,PROPFIND,PROPPATCH,MKCOL,COPY,MOVE,LOCK,UNLOCK'
         response["Dav"] = "1,2,3"
         response["Ms-Author-Via"] = "DAV"
diff --git a/test/integration/dmsf_webdav_options_test.rb b/test/integration/dmsf_webdav_options_test.rb
new file mode 100644
index 00000000..0c3e6006
--- /dev/null
+++ b/test/integration/dmsf_webdav_options_test.rb
@@ -0,0 +1,107 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
+
+  fixtures :projects, :users, :members, :member_roles, :roles, :enabled_modules, :dmsf_folders
+
+  def setup
+    @headers = credentials('admin')
+    super
+  end
+
+  def teardown
+    @headers = nil
+  end
+
+  test "OPTIONS requires no authentication for root level" do
+    xml_http_request  :options, "dmsf/webdav"
+    assert_response :success
+  end
+
+  test "OPTIONS returns expected Allow header" do
+    xml_http_request  :options, "dmsf/webdav"
+    assert_response :success
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert !response.headers["Allow"].nil? , "Allow header is empty or does not exist"
+    assert response.headers["Allow"] == "OPTIONS,HEAD,GET,PUT,POST,DELETE,PROPFIND,PROPPATCH,MKCOL,COPY,MOVE,LOCK,UNLOCK", "Allow header returns expected content"
+  end
+
+  test "OPTIONS returns expected Dav header" do
+    xml_http_request  :options, "dmsf/webdav"
+    assert_response :success
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert !response.headers["Dav"].nil? , "Dav header is empty or does not exist"
+    assert response.headers["Dav"] == "1,2,3", "Dav header - expected: 1,2,3"
+  end
+
+  test "OPTIONS returns expected Ms-Auth-Via header" do
+    xml_http_request  :options, "dmsf/webdav"
+    assert_response :success
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert !response.headers["Ms-Author-Via"].nil? , "Ms-Author-Via header is empty or does not exist"
+    assert response.headers["Ms-Author-Via"] == "DAV", "Ms-Author-Via header - expected: DAV"
+  end
+
+  test "OPTIONS requires authentication for non-root request" do
+    xml_http_request :options, "dmsf/webdav/#{Project.find(1).identifier}"
+    assert_response 401 #Unauthorized
+  end
+
+  test "Un-authenticated OPTIONS returns expected Allow header" do
+    xml_http_request  :options, "dmsf/webdav/#{Project.find(1).identifier}"
+    assert_response 401
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert response.headers["Allow"].nil? , "Allow header should not exist"
+    assert response.headers["Allow"] != "OPTIONS,HEAD,GET,PUT,POST,DELETE,PROPFIND,PROPPATCH,MKCOL,COPY,MOVE,LOCK,UNLOCK", "Allow header returns expected"
+  end
+
+  test "Un-authenticated OPTIONS returns expected Dav header" do
+    xml_http_request  :options, "dmsf/webdav/#{Project.find(1).identifier}"
+    assert_response 401
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert response.headers["Dav"].nil? , "Dav header should not exist"
+    assert response.headers["Dav"] != "1,2,3", "Dav header - expected: <None>"
+  end
+
+  test "Un-athenticated OPTIONS returns expected Ms-Auth-Via header" do
+    xml_http_request  :options, "dmsf/webdav/#{Project.find(1).identifier}"
+    assert_response 401
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert response.headers["Ms-Author-Via"].nil? , "Ms-Author-Via header should not exist"
+    assert response.headers["Ms-Author-Via"] != "DAV", "Ms-Author-Via header - expected: <None>"
+  end
+
+
+  test "Authenticated OPTIONS returns expected Allow header" do
+    xml_http_request  :options, "dmsf/webdav/#{Project.find(1).identifier}", nil, @headers
+    assert_response :success
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert !response.headers["Allow"].nil? , "Allow header is empty or does not exist"
+    assert response.headers["Allow"] == "OPTIONS,HEAD,GET,PUT,POST,DELETE,PROPFIND,PROPPATCH,MKCOL,COPY,MOVE,LOCK,UNLOCK", "Allow header returns expected"
+  end
+
+  test "Authenticated OPTIONS returns expected Dav header" do
+    xml_http_request  :options, "dmsf/webdav/#{Project.find(1).identifier}", nil, @headers
+    assert_response :success
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert !response.headers["Dav"].nil? , "Dav header is empty or does not exist"
+    assert response.headers["Dav"] == "1,2,3", "Dav header - expected: 1,2,3"
+  end
+
+  test "Authenticated OPTIONS returns expected Ms-Auth-Via header" do
+    xml_http_request  :options, "dmsf/webdav/#{Project.find(1).identifier}", nil, @headers
+    assert_response :success
+    assert !(response.headers.nil? || response.headers.empty?), "Response headers are empty"
+    assert !response.headers["Ms-Author-Via"].nil? , "Ms-Author-Via header is empty or does not exist"
+    assert response.headers["Ms-Author-Via"] == "DAV", "Ms-Author-Via header - expected: DAV"
+  end
+
+  test "Authenticated OPTIONS returns 404 for not-found or non-dmsf-enabled items" do
+    xml_http_request  :options, "dmsf/webdav/#{Project.find(2).identifier}", nil, @headers
+    assert_response 404 #not found
+    xml_http_request  :options, "dmsf/webdav/does-not-exist", nil, @headers
+    assert_response 404 #not found
+  end
+
+  
+end