1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java b/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java
index f54f38f..38e1eba 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/DelaySerializer.java
@@ -25,7 +25,8 @@ public class DelaySerializer extends GenericPayloadSerializer<Delay> {
         if (delay.getFrom() != null && delay.getFrom().isValid()) {
             delayElement.setAttribute("from", delay.getFrom().toString());
         }
-        delayElement.setAttribute("stamp", DateTime.dateToString(delay.getStamp()));
+        if(delay.getStamp() != null)
+            delayElement.setAttribute("stamp", DateTime.dateToString(delay.getStamp()));
         return delayElement.serialize();
     }
 }