diff --git a/examples/client_test.cpp b/examples/client_test.cpp
index cec81683b..237ee420b 100755
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -152,7 +152,7 @@ int main(int argc, char* argv[])
 	using namespace libtorrent;
 
 	// TEMPORARY
-	boost::filesystem::path::default_name_check(boost::filesystem::no_check);
+//	boost::filesystem::path::default_name_check(boost::filesystem::no_check);
 
 	if (argc < 2)
 	{
diff --git a/include/libtorrent/torrent_info.hpp b/include/libtorrent/torrent_info.hpp
index 57c7004e9..b4b65912c 100755
--- a/include/libtorrent/torrent_info.hpp
+++ b/include/libtorrent/torrent_info.hpp
@@ -72,6 +72,11 @@ namespace libtorrent
 		virtual const char* what() const throw() { return "invalid torrent file"; }
 	};
 
+	// TODO: add a check to see if filenames are accepted on the
+	// current platform.
+	// TODO: add a filename converter function that will transform
+	// invalid filenames to valid filenames on the current platform
+
 	class torrent_info
 	{
 	public:
diff --git a/src/session.cpp b/src/session.cpp
index cda138ba1..2690a7d6b 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -532,6 +532,8 @@ namespace libtorrent
 	}
 
 
+	// TODO: add a check to see if filenames are accepted on the
+	// current platform.
 	// if the torrent already exists, this will throw duplicate_torrent
 	torrent_handle session::add_torrent(
 		const torrent_info& ti
diff --git a/src/storage.cpp b/src/storage.cpp
index bebf131b4..81beac184 100755
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -1088,7 +1088,6 @@ entry::integer_type libtorrent::storage::piece_storage(int piece)
 			return m_allocated_pieces[piece];
 		}
 
-		assert(false);
 	}
 
 	return result;