From 9df3481a9b968d1fc029deec0de3a7362813dd5e Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 6 Dec 2016 21:15:45 +0800
Subject: [PATCH] Check for exceptions

---
 .../main/java/net/citizensnpcs/trait/MountTrait.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/trait/MountTrait.java b/main/src/main/java/net/citizensnpcs/trait/MountTrait.java
index 6f4b9aac3..25d10be53 100644
--- a/main/src/main/java/net/citizensnpcs/trait/MountTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/MountTrait.java
@@ -14,9 +14,10 @@ import net.citizensnpcs.util.NMS;
 
 @TraitName("mounttrait")
 public class MountTrait extends Trait {
-    @Persist("mountedon") private String uuid;
     private UUID mountedOn;
     private boolean triggered = false;
+    @Persist("mountedon")
+    private String uuid;
 
     public MountTrait() {
         super("mounttrait");
@@ -49,8 +50,12 @@ public class MountTrait extends Trait {
     public void run() {
         if (!npc.isSpawned())
             return;
-        if(!triggered && uuid != null) {
-            mountedOn = UUID.fromString(uuid);
+        if (!triggered && uuid != null) {
+            try {
+                mountedOn = UUID.fromString(uuid);
+            } catch (IllegalArgumentException e) {
+                mountedOn = null;
+            }
             checkMount(null);
         }
         Entity e = NMS.getVehicle(npc.getEntity());