diff --git a/Release/Plugins/Servo.dll b/Release/Plugins/Servo.dll
index 24b4cfd..82b5752 100644
Binary files a/Release/Plugins/Servo.dll and b/Release/Plugins/Servo.dll differ
diff --git a/Source/main.cpp b/Source/main.cpp
index 2afb087..45a47c9 100644
--- a/Source/main.cpp
+++ b/Source/main.cpp
@@ -60,13 +60,20 @@ void Servo::formatCommand(std::string* command)
     std::stringstream id;
     id << m_AshitaCore->GetDataManager()->GetTarget()->GetTargetServerId();
 
-    *command = StringSub(*command, "[me]", m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(0));
-    *command = StringSub(*command, "[p0]", m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(0));
-    *command = StringSub(*command, "[p1]", m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(1));
-    *command = StringSub(*command, "[p2]", m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(2));
-    *command = StringSub(*command, "[p3]", m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(3));
-    *command = StringSub(*command, "[p4]", m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(4));
-    *command = StringSub(*command, "[p5]", m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(5));
+    auto p0 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(0);
+    auto p1 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(1);
+    auto p2 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(2);
+    auto p3 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(3);
+    auto p4 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(4);
+    auto p5 = m_AshitaCore->GetDataManager()->GetParty()->GetMemberName(4);
+
+    *command = StringSub(*command, "[me]", p0 != nullptr ? p0 : "");
+    *command = StringSub(*command, "[p0]", p0 != nullptr ? p0 : "");
+    *command = StringSub(*command, "[p1]", p1 != nullptr ? p1 : "");
+    *command = StringSub(*command, "[p2]", p2 != nullptr ? p2 : "");
+    *command = StringSub(*command, "[p3]", p3 != nullptr ? p3 : "");
+    *command = StringSub(*command, "[p4]", p4 != nullptr ? p4 : "");
+    *command = StringSub(*command, "[p5]", p5 != nullptr ? p5 : "");
     *command = StringSub(*command, "[t]", id.str());
 }