diff --git a/ChangeLog b/ChangeLog
index 1b7f803a71..4277f6b30b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-05-31  Dave Peticolas  <dave@krondo.com>
 
+	* src/engine/sixtp-dom-parsers.c (string_to_binary): fix sanity
+	checks
+
 	* src/test/test-dom-converters1.c (test_dom_tree_to_gnc_numeric):
 	fix bug
 
diff --git a/src/engine/sixtp-dom-parsers.c b/src/engine/sixtp-dom-parsers.c
index ffa4d4c602..8e62f331c0 100644
--- a/src/engine/sixtp-dom-parsers.c
+++ b/src/engine/sixtp-dom-parsers.c
@@ -183,7 +183,10 @@ string_to_binary(const gchar *str,  void **v, guint64 *data_len)
   guint64 str_len;
   guchar *data;
   int i, j;
-  
+
+  g_return_val_if_fail(v != NULL, FALSE);
+  g_return_val_if_fail(data_len != NULL, FALSE);
+
   str_len = strlen(str);
 
   /* Since no whitespace is allowed and hex encoding is 2 text chars
@@ -193,14 +196,12 @@ string_to_binary(const gchar *str,  void **v, guint64 *data_len)
       return(FALSE);
   *data_len = str_len / 2;
   data = g_new0(guchar, *data_len);
-  
-  g_return_val_if_fail(*v, FALSE);
 
   for(j = 0, i = 0; i < str_len; i += 2, j++)
   {
       gchar tmpstr[3];
       long int converted;
-      
+
       tmpstr[0] = str[i];
       tmpstr[1] = str[i + 1];
       tmpstr[2] = '\0';
@@ -211,7 +212,7 @@ string_to_binary(const gchar *str,  void **v, guint64 *data_len)
   }
 
   *v = data;
-  
+
   return(TRUE);
 }