diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index 8639d9e246..9472f25280 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -297,9 +297,11 @@ handle_property_changed (gpointer key, gpointer data, gpointer user_data)
 		}
 	}
 
-	if (!found)
+	if (!found) {
+#if DEBUG
 		g_warning ("Property '%s' unhandled.", prop_name);
-	else if (!success)
+#endif
+	} else if (!success)
 		g_warning ("Property '%s' could not be set due to errors.", prop_name);
 
 out: