diff --git a/source/ps/CConsole.h b/source/ps/CConsole.h
index 3707f56b24..04e5c6df75 100755
--- a/source/ps/CConsole.h
+++ b/source/ps/CConsole.h
@@ -58,7 +58,7 @@ private:
 	bool IsFull(void) {return (m_iBufferLength == BUFFER_SIZE);};
 	bool IsEmpty(void) {return (m_iBufferLength == 0);};
 
-	void InsertBuffer(void){InsertMessage(m_szBuffer);};
+	void InsertBuffer(void){InsertMessage(L"%ls", m_szBuffer);};
     void ProcessBuffer(const wchar_t* szLine);
 
 public:
diff --git a/source/ps/CLogger.cpp b/source/ps/CLogger.cpp
index 2b795cdc07..0609ce9a03 100755
--- a/source/ps/CLogger.cpp
+++ b/source/ps/CLogger.cpp
@@ -89,7 +89,7 @@ CLogger::~CLogger ()
 void CLogger::WriteMessage(const char *message)
 {
 #ifdef CONSOLE_DEBUG
-	g_Console->InsertMessage(L"LOG: %hs", message);
+	if (g_Console) g_Console->InsertMessage(L"LOG: %hs", message);
 #endif
 	m_NumberOfMessages++;
 	m_MainLog << "<P>" << message << "</P>";
@@ -101,7 +101,7 @@ void CLogger::WriteMessage(const char *message)
 void CLogger::WriteError(const char *message)
 {
 #ifdef CONSOLE_DEBUG
-	g_Console->InsertMessage(L"ERROR: %hs", message);
+	if (g_Console) g_Console->InsertMessage(L"ERROR: %hs", message);
 #endif
 	debug_out("ERROR: %s\n", message);
 	m_NumberOfErrors++;
@@ -112,7 +112,7 @@ void CLogger::WriteError(const char *message)
 void CLogger::WriteWarning(const char *message)
 {
 #ifdef CONSOLE_DEBUG
-	g_Console->InsertMessage(L"WARNING: %hs", message);
+	if (g_Console) g_Console->InsertMessage(L"WARNING: %hs", message);
 #endif
 	m_NumberOfWarnings++;
 	m_MainLog << "<P class=\"warning\">WARNING: "<< message << "</P>\n";