diff --git a/pcsx2/Linux/LnxSysExec.cpp b/pcsx2/Linux/LnxSysExec.cpp
index 7825874fe1..d6c03c6887 100644
--- a/pcsx2/Linux/LnxSysExec.cpp
+++ b/pcsx2/Linux/LnxSysExec.cpp
@@ -249,7 +249,7 @@ void RunGui()
 	{
 		// Initially bypass GUI and start PCSX2 directly.
 		CDVDsys_ChangeSource( g_Startup.CdvdSource );
-		DoCDVDopen( g_Startup.ImageName );
+		if( !OpenCDVD( g_Startup.ImageName ) ) return;
 		
 		if (OpenPlugins() == -1) return;
 		
diff --git a/pcsx2/windows/WinMain.cpp b/pcsx2/windows/WinMain.cpp
index 201174ff0f..cbe8f8a8ac 100644
--- a/pcsx2/windows/WinMain.cpp
+++ b/pcsx2/windows/WinMain.cpp
@@ -379,10 +379,8 @@ void RunGui()
 		// Initially bypass GUI and start PCSX2 directly.
 
 		CDVDsys_ChangeSource( g_Startup.CdvdSource );
-		DoCDVDopen( g_Startup.ImageName );
-
-		if (OpenPlugins() == -1)
-			return;
+		if( !OpenCDVD( g_Startup.ImageName ) ) return;
+		if( OpenPlugins() == -1 ) return;
 
 		SysPrepareExecution( (g_Startup.StartupMode == Startup_FromELF) ? g_Startup.ImageName : NULL, !g_Startup.SkipBios );
 	}