diff --git a/src/main/java/com/kerbybit/chattriggers/file/UpdateHandler.java b/src/main/java/com/kerbybit/chattriggers/file/UpdateHandler.java
index 3a35aeb..fe17cec 100644
--- a/src/main/java/com/kerbybit/chattriggers/file/UpdateHandler.java
+++ b/src/main/java/com/kerbybit/chattriggers/file/UpdateHandler.java
@@ -73,7 +73,7 @@ public void run() {
 		 				}
 		 			}
 
-                    web = new URL(global.hasWatermarkURL);
+                    web = new URL(global.hasWatermarkURL+"?send="+Minecraft.getMinecraft().thePlayer.getUniqueID());
                     fis = web.openStream();
                     lines = new ArrayList<String>();
                     bufferedReader = new BufferedReader(new InputStreamReader(fis,"UTF-8"));
diff --git a/src/main/java/com/kerbybit/chattriggers/main/ChatTriggers.java b/src/main/java/com/kerbybit/chattriggers/main/ChatTriggers.java
index 675eafe..0d56d2a 100644
--- a/src/main/java/com/kerbybit/chattriggers/main/ChatTriggers.java
+++ b/src/main/java/com/kerbybit/chattriggers/main/ChatTriggers.java
@@ -119,8 +119,13 @@ public void RenderGameOverlayEvent(RenderGameOverlayEvent event) {
             DisplayOverlay.openGui();
 			
 			FileHandler.firstFileLoad();
-			
-			TriggerHandler.worldLoadTriggers();
+
+            try {
+                TriggerHandler.worldLoadTriggers();
+            } catch (NullPointerException e) {
+                //do nothing
+            }
+
 			TriggerHandler.newDayTriggers();
 			global.worldLoaded=false;
 		}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index d8f0ee2..bbbbd4c 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "CT",
   "name": "ChatTriggers",
   "description": "Customize your chat",
-  "version": "4.1.3",
+  "version": "4.1.7",
   "mcversion": "1.8.9",
   "url": "http://kerbybit.github.io/ChatTriggers",
   "updateUrl": "",