diff --git a/stepmania/src/CodeSet.cpp b/stepmania/src/CodeSet.cpp
index 23645c6e1d..1917594e82 100644
--- a/stepmania/src/CodeSet.cpp
+++ b/stepmania/src/CodeSet.cpp
@@ -47,7 +47,7 @@ bool InputQueueCodeSet::InputMessage( const InputEventPlus &input, Message &msg
 	if( sCodeName.empty() )
 		return false;
 
-	msg = Message("Code");
+	msg.SetName("Code");
 	msg.SetParam( "PlayerNumber", input.pn );
 	msg.SetParam( "Name", sCodeName );
 	return true;
diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h
index 4e87d3aef4..7338eb2280 100644
--- a/stepmania/src/MessageManager.h
+++ b/stepmania/src/MessageManager.h
@@ -86,6 +86,8 @@ struct Message
 	explicit Message( const RString &s );
 	Message( const RString &s, const LuaReference &params );
 	~Message();
+
+	void SetName( const RString &sName ) { m_sName = sName; }
 	RString GetName() const { return m_sName; }
 
 	bool IsBroadcast() const { return m_bBroadcast; }
@@ -124,6 +126,9 @@ private:
 	RString m_sName;
 	LuaTable *m_pParams;
 	bool m_bBroadcast;
+
+	Message &operator=( const Message &rhs ); // don't use
+	Message( const Message &rhs ); // don't use
 };
 
 class IMessageSubscriber