diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index e6800004f..ed8621f5e 100755
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -1620,12 +1620,6 @@ namespace libtorrent
 		}
 #endif
 
-		// if we already have the piece, we can
-		// ignore this message
-		if (t->valid_metadata()
-			&& t->have_piece(index))
-			return;
-
 		if (index < 0 || index >= int(m_have_piece.size()))
 		{
 #ifdef TORRENT_VERBOSE_LOGGING
@@ -1635,6 +1629,12 @@ namespace libtorrent
 			return;
 		}
 
+		// if we already have the piece, we can
+		// ignore this message
+		if (t->valid_metadata()
+			&& t->have_piece(index))
+			return;
+
 		m_allowed_fast.push_back(index);
 
 		// if the peer has the piece and we want