diff --git a/rpcs3/Emu/SysCalls/LogBase.cpp b/rpcs3/Emu/SysCalls/LogBase.cpp
index 47bb4458be..2afeb52bae 100644
--- a/rpcs3/Emu/SysCalls/LogBase.cpp
+++ b/rpcs3/Emu/SysCalls/LogBase.cpp
@@ -34,21 +34,21 @@ void LogBase::LogOutput(LogType type, const u32 id, const char* info, const std:
 hle::error::error(s32 errorCode, const char* errorText)
 	: code(errorCode)
 	, base(nullptr)
-	, text(errorText)
+	, text(errorText ? errorText : "")
 {
 }
 
 hle::error::error(s32 errorCode, const LogBase& errorBase, const char* errorText)
 	: code(errorCode)
 	, base(&errorBase)
-	, text(errorText)
+	, text(errorText ? errorText : "")
 {
 }
 
 hle::error::error(s32 errorCode, const LogBase* errorBase, const char* errorText)
 	: code(errorCode)
 	, base(errorBase)
-	, text(errorText)
+	, text(errorText ? errorText : "")
 {
 }
 
diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
index bccbb5fd8d..009d91d35a 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp
@@ -127,19 +127,12 @@ int cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
 		if (callback && (g_msg_dialog_state != msgDialogAbort))
 			callback.async((s32)status, userData); // TODO: this callback should be registered
 
-		CallAfter([&m_signal]()
+		CallAfter([]()
 		{
 			MsgDialogDestroy();
 
-			m_signal = false;
+			g_msg_dialog_state = msgDialogNone;
 		});
-
-		while (m_signal)
-		{
-			std::this_thread::sleep_for(std::chrono::milliseconds(1));
-		}
-
-		g_msg_dialog_state = msgDialogNone;
 	});
 	t.detach();