diff --git a/BizHawk.Client.Common/movie/import/MovieImport.cs b/BizHawk.Client.Common/movie/import/MovieImport.cs
index 33eb7b1e73..9110615a37 100644
--- a/BizHawk.Client.Common/movie/import/MovieImport.cs
+++ b/BizHawk.Client.Common/movie/import/MovieImport.cs
@@ -203,8 +203,15 @@ namespace BizHawk.Client.Common
 				errorMsg = except.ToString();
 			}
 
-			m.Filename += "." + BkmMovie.Extension;
-
+			if (m != null)
+			{
+				m.Filename += "." + BkmMovie.Extension;
+			}
+			else
+			{
+				throw new Exception(errorMsg);
+			}
+			
 			return m;
 		}