diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 5b510ae0f3..7f5beea704 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -122,7 +122,7 @@ void LyXVC::registrer()
 		} else {
 			LYXERR(Debug::LYXVC, "LyXVC: registering "
 				<< to_utf8(filename.displayName()) << " with RCS");
-			vcs.reset(new RCS(filename));
+			vcs.reset(new RCS(FileName()));
 		}
 
 		vcs->owner(owner_);
diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 806c795282..1def1af1b0 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -102,6 +102,9 @@ void RCS::retrieve(FileName const & file)
 
 void RCS::scanMaster()
 {
+	if (master_.empty())
+		return;
+
 	LYXERR(Debug::LYXVC, "LyXVC::RCS: scanMaster: " << master_);
 
 	ifstream ifs(master_.toFilesystemEncoding().c_str());