diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 0aa7650891..8c0a599bc8 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1601,12 +1601,13 @@ device_ip_link_changed (NMDevice *self)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 	const NMPlatformLink *pllink;
-	int ip_ifindex;
 
 	priv->device_ip_link_changed_id = 0;
 
-	ip_ifindex = nm_device_get_ip_ifindex (self);
-	pllink = nm_platform_link_get (NM_PLATFORM_GET, ip_ifindex);
+	if (!priv->ip_ifindex)
+		return G_SOURCE_REMOVE;
+
+	pllink = nm_platform_link_get (NM_PLATFORM_GET, priv->ip_ifindex);
 	if (!pllink)
 		return G_SOURCE_REMOVE;
 
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index ddf4c1e5da..49f7075347 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -800,6 +800,7 @@ ppp_watch_cb (GPid pid, gint status, gpointer user_data)
 
 	nm_log_dbg (LOGD_PPP, "pppd pid %d cleaned up", priv->pid);
 	priv->pid = 0;
+	priv->ppp_watch_id = 0;
 	g_signal_emit (manager, signals[STATE_CHANGED], 0, NM_PPP_STATUS_DEAD);
 }