1 files changed, 6 insertions, 0 deletions
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index 9ca04e6..d5e4274 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -317,6 +317,9 @@ public class VSTask implements Comparable, VSSerializable {
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
     public int compareTo(Object object) {
+		if (object == null)
+			return 0;
+
         if (object instanceof VSTask) {
             final VSTask task = (VSTask) object;
 
@@ -328,6 +331,9 @@ public class VSTask implements Comparable, VSSerializable {
 
             VSAbstractEvent event2 = task.getEvent();
 
+			if (event2 == null || event == null)
+				return 0;
+
             /* If it's a recovering, it should get handled very first */
             boolean a = event instanceof VSProcessRecoverEvent;
             boolean b = event2 instanceof VSProcessRecoverEvent;