diff --git a/aegisub/video_provider_ffmpegsource.cpp b/aegisub/video_provider_ffmpegsource.cpp
index d09ae3a7bbbc657a337d787d64b3337c279b73e3..8a1a86f9a0653e143d6ea8b22c4eda5183d3c79a 100644
--- a/aegisub/video_provider_ffmpegsource.cpp
+++ b/aegisub/video_provider_ffmpegsource.cpp
@@ -63,7 +63,7 @@ FFmpegSourceVideoProvider::FFmpegSourceVideoProvider(Aegisub::String filename, d
 		LoadVideo(filename, fps);
 	} catch (...) {
 		Close();
-		//throw;
+		throw;
 	}
 }
 
@@ -82,7 +82,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps)
 	wxString FileNameWX(filename.c_str(), wxConvFile);
 
 	// generate a name for the cache file
-	wxString CacheName = GetCacheFilename(filename);
+	wxString CacheName = wxString(GetCacheFilename(filename).c_str(),wxConvFile);
 
 	// try to read index
 	Index = FFMS_ReadIndex(CacheName.char_str(), FFMSErrorMessage, MessageSize);