diff --git a/youtube-dl b/youtube-dl
index b21e63b054..514f71aa64 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -927,17 +927,18 @@ class YoutubeIE(InfoExtractor):
 				})
 
 				if all_formats:
+					quality_index += 1
 					if quality_index == len(self._available_formats):
 						# None left to get
 						return
 					else:
-						quality_index += 1
 						format_param = self._available_formats[quality_index]
 						continue
 				return
 
 			except UnavailableFormatError, err:
 				if best_quality or all_formats:
+					quality_index += 1
 					if quality_index == len(self._available_formats):
 						# I don't ever expect this to happen
 						if not all_formats:
@@ -945,7 +946,6 @@ class YoutubeIE(InfoExtractor):
 						return
 					else:
 						self.report_unavailable_format(video_id, format_param)
-						quality_index += 1
 						format_param = self._available_formats[quality_index]
 						continue
 				else: