diff --git a/stepmania/src/archutils/Unix/CrashHandler.cpp b/stepmania/src/archutils/Unix/CrashHandler.cpp
index f59551dd97..5e032fce04 100644
--- a/stepmania/src/archutils/Unix/CrashHandler.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandler.cpp
@@ -399,13 +399,13 @@ void ForceCrashHandler( const char *reason )
 }
 
 #if defined(LINUX)
-void ForceCrashHandlerDeadlock( CString reason, const BacktraceContext *ctx )
+void ForceCrashHandlerDeadlock( const CString& reason, const BacktraceContext *ctx )
 {
 	CrashData crash;
 	memset( &crash, 0, sizeof(crash) );
 
 	crash.type = CrashData::FORCE_CRASH_DEADLOCK;
-	strncpy( crash.reason, reason, sizeof(crash.reason) );
+	strncpy( crash.reason, reason, min(sizeof(crash.reason) - 1, reason.length()) );
 	crash.reason[ sizeof(crash.reason)-1 ] = 0;
 
 	GetBacktrace( crash.BacktracePointers, BACKTRACE_MAX_SIZE, NULL );
@@ -414,20 +414,30 @@ void ForceCrashHandlerDeadlock( CString reason, const BacktraceContext *ctx )
 	RunCrashHandler( &crash );
 }
 
-/* iCrashHandle comes from ThreadImpl_Pthreads::GetCrashHandle. */
-void ForceCrashHandlerDeadlock( CString reason, uint64_t iCrashHandle )
+/* iCrashHandle comes from ThreadImpl_Pthreads::GetThreadId. */
+void ForceCrashHandlerDeadlock( const CString& reason, uint64_t iCrashHandle )
 {
 	BacktraceContext ctx;
 	if( !GetThreadBacktraceContext( iCrashHandle, &ctx ) )
 	{
 		reason += "; GetThreadBacktraceContext failed";
 		ForceCrashHandler( reason );
-	} else {
-		ForceCrashHandlerDeadlock( reason, &ctx );
 	}
+	else
+		ForceCrashHandlerDeadlock( reason, &ctx );
 
 	_exit(1);
 }
+#else
+void ForceCrashHandlerDeadlock( const CString& reason, const BacktraceContext *ctx )
+{
+	ForceCrashHandler( reason );
+}
+
+void ForceCrashHandlerDeadlock( const CString& reason, uint64_t iCrashHandle )
+{
+	ForceCrashHandler( reason );
+}
 #endif
 
 /* XXX test for recursive crashes here (eg. GetBacktrace crashing) */