diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index c50baca1cf..df9749aec6 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-30  Robert Love  <rml@novell.com>
+
+	Patch by Crispin Flowerday <gnome@flowerday.cx>:
+	* src/nm-openvpn-service-helper.c: Fix crash when no PtP IP address is
+	  supplied.
+
 2006-03-29  Robert Love  <rml@novell.com>
 
 	* src/nm-openvpn-service.c: New eigth argument to DBUS VPN method, the
diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c b/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
index 271b4ffe71..59469b6681 100644
--- a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
+++ b/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
@@ -175,7 +175,7 @@ send_config_info (DBusConnection *con,
     goto out;
   }
 
-  if (! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) {
+  if (str_ip4_ptpaddr && ! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) {
     nm_warning ("nm-openvpn-service-openvpn-helper didn't receive a valid PtP IP4 Address from openvpn.");
     send_config_error (con, "IP4 PtP Address");
     goto out;