diff --git a/src/session.cpp b/src/session.cpp
index 5c4b24bc8..0b30ffd34 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -1169,5 +1169,9 @@ namespace libtorrent
 		{
 			return;
 		}
+		catch (file_error)
+		{
+			return;
+		}
 	}
 }
diff --git a/src/storage.cpp b/src/storage.cpp
index baaa29a36..ec63ffb24 100755
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -963,7 +963,7 @@ namespace libtorrent
 			++file_iter)
 		{
 			fs::path dir = m_save_path / m_info.name() / file_iter->path;
-			fs::create_directories(dir);
+			fs::create_directories(dir.branch_path());
 		}
 
 		std::vector<char> piece_data(m_info.piece_length());