diff --git a/Emitters todo.txt b/Emitters todo.txt
index 8e21eff..4a3eaf3 100644
--- a/Emitters todo.txt	
+++ b/Emitters todo.txt	
@@ -20,9 +20,9 @@ v3.0
 -	Add glowmasks for NPCs, items, and projectiles
 -	Draw layer control
 -	Add reset button to UIs
+
 v2.0
 -	Find alternative control to access emitter/hologram dialogs
-
 -	@MH
 	-	Fix not filtering verbose packets from PacketInfo
 	-	Ping packets are spammy
diff --git a/Emitters/Definitions/HologramDefinition_IO.cs b/Emitters/Definitions/HologramDefinition_IO.cs
index 86a5c2f..4d89f28 100644
--- a/Emitters/Definitions/HologramDefinition_IO.cs
+++ b/Emitters/Definitions/HologramDefinition_IO.cs
@@ -25,8 +25,8 @@ public override void Read( BinaryReader reader ) {
 			this.WorldLighting = (bool)reader.ReadBoolean();
 			this.ShaderMode = (HologramShaderMode)reader.ReadUInt16();
 			this.ShaderTime = (float)reader.ReadSingle();
-			this.IsActivated = (bool)reader.ReadBoolean();
 			this.ShaderType = (int)reader.ReadUInt16();
+			this.IsActivated = (bool)reader.ReadBoolean();
 		}
 
 		public override void Write( BinaryWriter writer ) {
diff --git a/Emitters/MyPlayer.cs b/Emitters/MyPlayer.cs
index dce712b..aa4f479 100644
--- a/Emitters/MyPlayer.cs
+++ b/Emitters/MyPlayer.cs
@@ -5,7 +5,7 @@
 namespace Emitters {
 	class EmittersPlayer : ModPlayer {
 		public override bool PreItemCheck() {
-			if( EmittersMod.Instance.EditorButton.PressEditorButtonIfInteracting() ) {
+			if( EmittersMod.Instance?.EditorButton?.PressEditorButtonIfInteracting() ?? false ) {
 				return false;
 			}
 			return base.PreItemCheck();