3 files changed, 7 insertions, 2 deletions
diff --git a/Swiften/Serializer/XML/XMLElement.cpp b/Swiften/Serializer/XML/XMLElement.cpp
index d39ec39..42b602a 100644
--- a/Swiften/Serializer/XML/XMLElement.cpp
+++ b/Swiften/Serializer/XML/XMLElement.cpp
@@ -53,6 +53,8 @@ void XMLElement::setAttribute(const std::string& attribute, const std::string& v
 
 void XMLElement::addNode(boost::shared_ptr<XMLNode> node) {
+	if (node) {
 		childNodes_.push_back(node);
 	}
+}
 
 }
diff --git a/Swiften/Serializer/XML/XMLElement.h b/Swiften/Serializer/XML/XMLElement.h
index 6eacb82..305932a 100644
--- a/Swiften/Serializer/XML/XMLElement.h
+++ b/Swiften/Serializer/XML/XMLElement.h
@@ -13,8 +13,9 @@
 #include <string>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Serializer/XML/XMLNode.h>
 
 namespace Swift {
-	class XMLElement : public XMLNode {
+	class SWIFTEN_API XMLElement : public XMLNode {
 		public:
 			typedef boost::shared_ptr<XMLElement> ref;
diff --git a/Swiften/Serializer/XML/XMLNode.h b/Swiften/Serializer/XML/XMLNode.h
index d222faf..9d9e1a0 100644
--- a/Swiften/Serializer/XML/XMLNode.h
+++ b/Swiften/Serializer/XML/XMLNode.h
@@ -9,6 +9,8 @@
 #include <string>
 
+#include <Swiften/Base/API.h>
+
 namespace Swift {
-	class XMLNode {
+	class SWIFTEN_API XMLNode {
 		public:
 			virtual ~XMLNode();