2 files changed, 3 insertions, 0 deletions
diff --git a/Swiften/JID/JID.cpp b/Swiften/JID/JID.cpp
index 7b51867..e1502f1 100644
--- a/Swiften/JID/JID.cpp
+++ b/Swiften/JID/JID.cpp
@@ -133,4 +133,5 @@ namespace Swift {
 
 JID::JID(const char* jid) : valid_(true) {
+	assert(jid);
 	initializeFromString(std::string(jid));
 }
diff --git a/Swiften/JID/JID.h b/Swiften/JID/JID.h
index 798860d..eac1e2a 100644
--- a/Swiften/JID/JID.h
+++ b/Swiften/JID/JID.h
@@ -48,4 +48,6 @@ namespace Swift {
 			/**
 			 * See std::string constructor.
+			 *
+			 * Must not be NULL.
 			 */
 			JID(const char*);