diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index 4d9ea3fa3..168b10413 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -130,8 +130,6 @@ namespace libtorrent
 
 		~torrent();
 
-		void parse_resume_data(std::vector<char>* resume_data);
-
 #ifndef TORRENT_DISABLE_ENCRYPTION
 		sha1_hash const& obfuscated_hash() const
 		{ return m_obfuscated_hash; }
diff --git a/src/lazy_bdecode.cpp b/src/lazy_bdecode.cpp
index e823b07bc..44506cf5a 100644
--- a/src/lazy_bdecode.cpp
+++ b/src/lazy_bdecode.cpp
@@ -47,7 +47,11 @@ namespace
 
 namespace libtorrent
 {
-	int fail_bdecode() { return -1; }
+	int fail_bdecode(lazy_entry& ret)
+	{
+		ret = lazy_entry();
+		return -1;
+	}
 
 	// fills in 'val' with what the string between start and the
 	// first occurance of the delimiter is interpreted as an int.
@@ -58,7 +62,7 @@ namespace libtorrent
 		while (start < end && *start != delimiter)
 		{
 			using namespace std;
-			if (!isdigit(*start)) { fail_bdecode(); return 0; }
+			if (!isdigit(*start)) { return 0; }
 			val *= 10;
 			val += *start - '0';
 			++start;
@@ -87,11 +91,11 @@ namespace libtorrent
 
 			lazy_entry* top = stack.back();
 
-			if (int(stack.size()) > depth_limit) return fail_bdecode();
-			if (start >= end) return fail_bdecode();
+			if (int(stack.size()) > depth_limit) return fail_bdecode(ret);
+			if (start >= end) return fail_bdecode(ret);
 			char t = *start;
 			++start;
-			if (start >= end && t != 'e') return fail_bdecode();
+			if (start >= end && t != 'e') return fail_bdecode(ret);
 
 			switch (top->type())
 			{
@@ -105,12 +109,12 @@ namespace libtorrent
 					}
 					boost::int64_t len = t - '0';
 					start = parse_int(start, end, ':', len);
-					if (start == 0 || start + len + 3 > end || *start != ':') return fail_bdecode();
+					if (start == 0 || start + len + 3 > end || *start != ':') return fail_bdecode(ret);
 					++start;
-					if (start == end) fail_bdecode();
+					if (start == end) fail_bdecode(ret);
 					lazy_entry* ent = top->dict_append(start);
 					start += len;
-					if (start >= end) fail_bdecode();
+					if (start >= end) fail_bdecode(ret);
 					stack.push_back(ent);
 					t = *start;
 					++start;
@@ -145,7 +149,7 @@ namespace libtorrent
 					char const* int_start = start;
 					start = find_char(start, end, 'e');
 					top->construct_int(int_start, start - int_start);
-					if (start == end) return fail_bdecode();
+					if (start == end) return fail_bdecode(ret);
 					TORRENT_ASSERT(*start == 'e');
 					++start;
 					stack.pop_back();
@@ -154,11 +158,11 @@ namespace libtorrent
 				default:
 				{
 					using namespace std;
-					if (!isdigit(t)) return fail_bdecode();
+					if (!isdigit(t)) return fail_bdecode(ret);
 
 					boost::int64_t len = t - '0';
 					start = parse_int(start, end, ':', len);
-					if (start == 0 || start + len + 1 > end || *start != ':') return fail_bdecode();
+					if (start == 0 || start + len + 1 > end || *start != ':') return fail_bdecode(ret);
 					++start;
 					top->construct_string(start, int(len));
 					stack.pop_back();
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 90be35fbb..4f82fc1ba 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -205,7 +205,7 @@ namespace libtorrent
 		, m_start_sent(false)
 		, m_complete_sent(false)
 	{
-		parse_resume_data(resume_data);
+		if (resume_data) m_resume_data.swap(*resume_data);
 
 #ifndef TORRENT_DISABLE_ENCRYPTION
 		hasher h;
@@ -286,7 +286,7 @@ namespace libtorrent
 		, m_start_sent(false)
 		, m_complete_sent(false)
 	{
-		parse_resume_data(resume_data);
+		if (resume_data) m_resume_data.swap(*resume_data);
 
 #ifndef TORRENT_DISABLE_ENCRYPTION
 		hasher h;
@@ -309,27 +309,25 @@ namespace libtorrent
 		}
 	}
 
-	void torrent::parse_resume_data(std::vector<char>* resume_data)
-	{
-		if (!resume_data) return;
-		m_resume_data.swap(*resume_data);
-		if (lazy_bdecode(&m_resume_data[0], &m_resume_data[0]
-			+ m_resume_data.size(), m_resume_entry) != 0)
-		{
-			std::vector<char>().swap(m_resume_data);
-			if (m_ses.m_alerts.should_post<fastresume_rejected_alert>())
-			{
-				m_ses.m_alerts.post_alert(fastresume_rejected_alert(get_handle(), "parse failed"));
-#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
-				(*m_ses.m_logger) << "fastresume data for "
-					<< torrent_file().name() << " rejected: parse failed\n";
-#endif
-			}
-		}
-	}
-
 	void torrent::start()
 	{
+		if (!m_resume_data.empty())
+		{
+			if (lazy_bdecode(&m_resume_data[0], &m_resume_data[0]
+				+ m_resume_data.size(), m_resume_entry) != 0)
+			{
+				std::vector<char>().swap(m_resume_data);
+				if (m_ses.m_alerts.should_post<fastresume_rejected_alert>())
+				{
+					m_ses.m_alerts.post_alert(fastresume_rejected_alert(get_handle(), "parse failed"));
+#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
+					(*m_ses.m_logger) << "fastresume data for "
+						<< torrent_file().name() << " rejected: parse failed\n";
+#endif
+				}
+			}
+		}
+
 		// we need to start announcing since we don't have any
 		// metadata. To receive peers to ask for it.
 		if (m_torrent_file->is_valid()) init();