diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c
index 67b711b81..1ba3888a5 100644
--- a/src/NetworkManagerDbus.c
+++ b/src/NetworkManagerDbus.c
@@ -287,11 +287,9 @@ void nm_dbus_schedule_device_status_change_signal (NMData *data, NMDevice *dev,
 
 
 /*
- * nm_dbus_network_status_from_data
+ * nm_get_app_state_from_data
  *
- * Return a network status string based on our network data
- *
- * Caller MUST free returned value
+ * Return the state of the network connection
  *
  */
 NMState nm_get_app_state_from_data (NMData *data)
diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c
index fda29a6ef..39b8a4fd5 100644
--- a/src/NetworkManagerPolicy.c
+++ b/src/NetworkManagerPolicy.c
@@ -390,7 +390,7 @@ nm_policy_device_change_check (NMData *data)
 				 * link to the old access point.  We don't switch away
 				 * from Ad-Hoc APs either.
 				 */
-				gboolean same_essid = (strcmp (old_essid, new_essid) == 0);
+				gboolean same_essid = (nm_null_safe_strcmp (old_essid, new_essid) == 0);
 				if ((!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
 				{
 					nm_info ("SWITCH: found better connection '%s/%s'"