1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp b/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp
index 6148632..f809798 100644
--- a/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp
@@ -1,30 +1,30 @@
 /*
  * Copyright (c) 2010 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/Serializer/PayloadSerializers/DelaySerializer.h>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <Swiften/Base/String.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <Swiften/Base/DateTime.h>
 
 namespace Swift {
 
 DelaySerializer::DelaySerializer() : GenericPayloadSerializer<Delay>() {
 }
 
 std::string DelaySerializer::serializePayload(boost::shared_ptr<Delay> delay)  const {
 	XMLElement delayElement("delay", "urn:xmpp:delay");
-	if (delay->getFrom()) {
+	if (delay->getFrom() && delay->getFrom()->isValid()) {
 		delayElement.setAttribute("from", delay->getFrom()->toString());
 	}
 	delayElement.setAttribute("stamp", dateTimeToString(delay->getStamp()));
 	return delayElement.serialize();
 }
 
 }