diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h
index 8595b04d0c..2937e715cf 100644
--- a/pcsx2/gui/App.h
+++ b/pcsx2/gui/App.h
@@ -529,7 +529,7 @@ public:
 
 	GSFrame*			GetGsFramePtr() const		{ return (GSFrame*)wxWindow::FindWindowById( m_id_GsFrame ); }
 	MainEmuFrame*		GetMainFramePtr() const		{ return (MainEmuFrame*)wxWindow::FindWindowById( m_id_MainFrame ); }
-	DisassemblyDialog*	GetDisassemblyPtr() const	{ return (DisassemblyDialog*)wxWindow::FindWindowById( m_id_Disassembler ); }
+	DisassemblyDialog*	GetDisassemblyPtr() const	{ return m_id_Disassembler ? (DisassemblyDialog*)wxWindow::FindWindowById( m_id_Disassembler ) : NULL; }
 	
 	void enterDebugMode();
 	void leaveDebugMode();
@@ -749,4 +749,4 @@ extern void UI_DisableSysShutdown();
 
 extern ExecutorThread& GetSysExecutorThread();
 
-extern bool g_ConfigPanelChanged; //Indicates that the main config panel is open and holds unapplied changes.
\ No newline at end of file
+extern bool g_ConfigPanelChanged; //Indicates that the main config panel is open and holds unapplied changes.