diff --git a/src/file.cpp b/src/file.cpp
index a3024fb9f..1f2a5adb0 100755
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -140,7 +140,7 @@ namespace libtorrent
 			if (m_open_mode == mode_in)
 				return m_file.tellg();
 			else
-				m_file.tellp();
+				return m_file.tellp();
 		}
 	
 		fs::fstream m_file;
diff --git a/src/storage.cpp b/src/storage.cpp
index f3db6ac5a..be21d9131 100755
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -213,13 +213,8 @@ namespace libtorrent {
 
 //		assert(size_type(in.tellg()) == file_offset);
 #ifndef NDEBUG
-		size_type p = in.tell();
-		if (p != file_offset)
-		{
-			std::cerr << "in.tell(): " << p << "\n"
-				"file_offset: " << file_offset << "\n";
-		}
-		assert(in.tell() == file_offset);
+		size_type in_tell = in.tell();
+		assert(in_tell == file_offset);
 #endif
 
 		size_type left_to_read = size;
@@ -306,7 +301,10 @@ namespace libtorrent {
 		out.seek(file_offset);
 
 //		assert(file_offset == out.tellp());
-		assert(file_offset == out.tell());
+#ifndef NDEBUG
+		size_type out_tell = out.tell();
+		assert(file_offset == out_tell);
+#endif
 
 		size_type left_to_write = size;
 		size_type slot_size = m_pimpl->info.piece_size(slot);