diff --git a/Custom Commands and Macro Macros/CCMMPlugin.cs b/Custom Commands and Macro Macros/CCMMPlugin.cs
index 9dfc01f..c5cbc34 100644
--- a/Custom Commands and Macro Macros/CCMMPlugin.cs	
+++ b/Custom Commands and Macro Macros/CCMMPlugin.cs	
@@ -28,6 +28,8 @@ namespace CCMM {
             this.Interface.UiBuilder.OnBuildUi += this.Ui.Draw;
             this.Interface.UiBuilder.OnOpenConfigUi += this.Ui.OpenSettings;
             this.Interface.Framework.OnUpdateEvent += this.MacroHandler.OnFrameworkUpdate;
+            this.Interface.ClientState.OnLogin += this.MacroHandler.OnLogin;
+            this.Interface.ClientState.OnLogout += this.MacroHandler.OnLogout;
             foreach (KeyValuePair<string, string> entry in Commands.COMMANDS) {
                 this.Interface.CommandManager.AddHandler(entry.Key, new CommandInfo(this.Commands.OnCommand) {
                     HelpMessage = entry.Value,
@@ -41,6 +43,8 @@ namespace CCMM {
                     this.Interface.UiBuilder.OnBuildUi -= this.Ui.Draw;
                     this.Interface.UiBuilder.OnOpenConfigUi -= this.Ui.OpenSettings;
                     this.Interface.Framework.OnUpdateEvent -= this.MacroHandler.OnFrameworkUpdate;
+                    this.Interface.ClientState.OnLogin -= this.MacroHandler.OnLogin;
+                    this.Interface.ClientState.OnLogout -= this.MacroHandler.OnLogout;
                     foreach (string command in Commands.COMMANDS.Keys) {
                         this.Interface.CommandManager.RemoveHandler(command);
                     }
diff --git a/Custom Commands and Macro Macros/MacroHandler.cs b/Custom Commands and Macro Macros/MacroHandler.cs
index 8b340f0..1684178 100644
--- a/Custom Commands and Macro Macros/MacroHandler.cs	
+++ b/Custom Commands and Macro Macros/MacroHandler.cs	
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 
 namespace CCMM {
     public class MacroHandler {
+        private bool ready = false;
         private readonly static Regex WAIT = new Regex(@"<wait\.(\d+(?:\.\d+)?)>", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private readonly CCMMPlugin plugin;
@@ -19,6 +20,7 @@ namespace CCMM {
 
         public MacroHandler(CCMMPlugin plugin) {
             this.plugin = plugin ?? throw new ArgumentNullException(nameof(plugin), "CCMMPlugin cannot be null");
+            this.ready = this.plugin.Interface.ClientState.LocalPlayer != null;
         }
 
         private static string[] ExtractCommands(string macro) {
@@ -28,6 +30,10 @@ namespace CCMM {
         }
 
         public Guid SpawnMacro(Macro macro) {
+            if (!this.ready) {
+                return Guid.Empty;
+            }
+
             string[] commands = ExtractCommands(macro.Contents);
             Guid id = Guid.NewGuid();
             if (commands.Length == 0) {
@@ -87,9 +93,14 @@ namespace CCMM {
             return paused;
         }
 
+        public bool IsCancelled(Guid id) {
+            this.cancelled.TryGetValue(id, out bool cancelled);
+            return cancelled;
+        }
+
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "delegate")]
         public void OnFrameworkUpdate(Framework framework) {
-            if (!this.commands.Reader.TryRead(out string command)) {
+            if (!this.commands.Reader.TryRead(out string command) || !this.ready) {
                 return;
             }
 
@@ -112,5 +123,17 @@ namespace CCMM {
 
             return null;
         }
+
+        internal void OnLogin(object sender, EventArgs args) {
+            this.ready = true;
+        }
+
+        internal void OnLogout(object sender, EventArgs args) {
+            this.ready = false;
+
+            foreach (Guid id in this.Running.Keys) {
+                this.CancelMacro(id);
+            }
+        }
     }
 }