diff --git a/shared/nm-default.h b/shared/nm-default.h
index 547ee57c98..d8ca04bb6b 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -86,6 +86,30 @@ _nm_g_return_if_fail_warning (const char *log_domain,
 #define g_assertion_message_expr(domain, file, line, func, expr) \
 	g_assertion_message_expr(domain, file, line, "<unknown-fcn>", (expr) ? "<dropped>" : NULL)
 
+#undef g_return_val_if_reached
+#define g_return_val_if_reached(val) \
+    G_STMT_START { \
+        g_log (G_LOG_DOMAIN, \
+               G_LOG_LEVEL_CRITICAL, \
+               "file %s: line %d (%s): should not be reached", \
+               __FILE__, \
+               __LINE__, \
+               "<dropped>"); \
+        return (val); \
+    } G_STMT_END
+
+#undef g_return_if_reached
+#define g_return_if_reached() \
+    G_STMT_START { \
+        g_log (G_LOG_DOMAIN, \
+               G_LOG_LEVEL_CRITICAL, \
+               "file %s: line %d (%s): should not be reached", \
+               __FILE__, \
+               __LINE__, \
+               "<dropped>"); \
+        return; \
+    } G_STMT_END
+
 #define NM_ASSERT_G_RETURN_EXPR(expr) "<dropped>"
 #define NM_ASSERT_NO_MSG 1