diff --git a/stepmania/src/RageUtil_WorkerThread.cpp b/stepmania/src/RageUtil_WorkerThread.cpp
index 5422a7421a..cceb56388e 100644
--- a/stepmania/src/RageUtil_WorkerThread.cpp
+++ b/stepmania/src/RageUtil_WorkerThread.cpp
@@ -7,6 +7,7 @@ WorkerThread::WorkerThread( const CString &sName ):
 	m_WorkerEvent( "\"" + sName + "\" worker event" ),
 	m_HeartbeatEvent( "\"" + sName + "\" heartbeat event" )
 {
+	m_sName = sName;
 	m_Timeout.SetZero();
 	m_iRequest = REQ_NONE;
 	m_bTimedOut = false;
@@ -49,7 +50,7 @@ void WorkerThread::StopThread()
 	m_WorkerEvent.Lock();
 	if( m_bTimedOut )
 	{
-		LOG->Trace( "Waiting for timed-out fs \"%s\" to complete ...", m_WorkerThread.GetName().c_str() );
+		LOG->Trace( "Waiting for timed-out worker thread \"%s\" to complete ...", m_sName.c_str() );
 		while( m_bTimedOut )
 			m_WorkerEvent.Wait();
 	}
@@ -70,7 +71,7 @@ bool WorkerThread::DoRequest( int iRequest )
 	ASSERT( m_iRequest == REQ_NONE );
 
 	if( m_Timeout.IsZero() )
-		LOG->Warn( "Request made with timeout disabled" );
+		LOG->Warn( "Request made with timeout disabled (%s, iRequest = %i)", m_sName.c_str(), iRequest );
 
 	/* Set the request, and wake up the worker thread. */
 	m_WorkerEvent.Lock();
diff --git a/stepmania/src/RageUtil_WorkerThread.h b/stepmania/src/RageUtil_WorkerThread.h
index 509e4d69bb..9d79235d6a 100644
--- a/stepmania/src/RageUtil_WorkerThread.h
+++ b/stepmania/src/RageUtil_WorkerThread.h
@@ -55,6 +55,7 @@ private:
 	enum { REQ_SHUTDOWN = -1, REQ_NONE = -2 };
 	RageThread m_WorkerThread;
 	RageEvent m_WorkerEvent;
+	CString m_sName;
 	int m_iRequest;
 	bool m_bRequestFinished;
 	bool m_bTimedOut;