diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp
index d01a90a426..970cc32d16 100644
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@@ -1053,8 +1053,8 @@ void CALLBACK ErrorCallback( GLenum aErrorCode )
 {
     const GLubyte* eString = gluErrorString( aErrorCode );
 
-    DisplayError( NULL, wxString( std::string( "Tessellation error: " ) +
-            std::string( (const char*)( eString ) ) ) );
+    DisplayError( NULL, wxT( "Tessellation error: " ) +
+                        wxString( (const char*)( eString ), wxConvUTF8 ) );
 
     exit( 1 );
 }
diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index a2534c0623..77b828a8ba 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -139,8 +139,8 @@ void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool )
     {
         if( !static_cast<TOOL_INTERACTIVE*>( aTool )->Init() )
         {
-            DisplayError( NULL, wxString( std::string( "Initialization of the %s tool failed" ) +
-                                            aTool->GetName() ) );
+            DisplayError( NULL, wxT( "Initialization of the %s tool failed" ) +
+                                     wxString( aTool->GetName().c_str(), wxConvUTF8 ) );
 
             // Unregister the tool
             m_toolState.erase( aTool );