--- a/loudmouth/lm-message-node.c	Tue Aug 22 23:33:06 2006 +0000
+++ b/loudmouth/lm-message-node.c	Fri Sep 01 14:01:48 2006 +0000
@@ -177,6 +177,9 @@
 {
 	LmMessageNode *child;
 	
+        g_return_val_if_fail (node != NULL, NULL);
+        g_return_val_if_fail (name != NULL, NULL);
+
 	child = _lm_message_node_new (name);
 
 	lm_message_node_set_value (child, value);
@@ -234,6 +237,10 @@
 	gboolean  found = FALSE; 
 	GSList   *l;
 
+        g_return_if_fail (node != NULL);
+        g_return_if_fail (name != NULL);
+        g_return_if_fail (value != NULL);
+
 	for (l = node->attributes; l; l = l->next) {
 		KeyValuePair *kvp = (KeyValuePair *) l->data;
                 
@@ -272,6 +279,7 @@
         const gchar *ret_val = NULL;
 
         g_return_val_if_fail (node != NULL, NULL);
+        g_return_val_if_fail (name != NULL, NULL);
 
         for (l = node->attributes; l; l = l->next) {
                 KeyValuePair *kvp = (KeyValuePair *) l->data;
@@ -298,7 +306,10 @@
 lm_message_node_get_child (LmMessageNode *node, const gchar *child_name)
 {
 	LmMessageNode *l;
-	
+
+        g_return_val_if_fail (node != NULL, NULL);
+        g_return_val_if_fail (child_name != NULL, NULL);
+
 	for (l = node->children; l; l = l->next) {
 		if (strcmp (l->name, child_name) == 0) {
 			return l;
@@ -325,6 +336,9 @@
         LmMessageNode *l;
         LmMessageNode *ret_val = NULL;
 
+        g_return_val_if_fail (node != NULL, NULL);
+        g_return_val_if_fail (child_name != NULL, NULL);
+
         for (l = node->children; l; l = l->next) {
                 if (strcmp (l->name, child_name) == 0) {
                         return l;