diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index a52e36d1e8..385731896f 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -2157,10 +2157,8 @@ nm_utils_hwaddr_ntoa_len (gconstpointer addr, gsize length)
 	char *out, *result;
 	const char *LOOKUP = "0123456789ABCDEF";
 
-	if (!addr || !length) {
-		g_return_val_if_reached (g_strdup (""));
-		return g_strdup ("");
-	}
+	g_return_val_if_fail (addr != NULL, g_strdup (""));
+	g_return_val_if_fail (length != 0, g_strdup (""));
 
 	result = out = g_malloc (length * 3);
 	for (;;) {
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 6a3bbef6b1..71c60ca5bf 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -2542,7 +2542,6 @@ _change_type_to_string (NMPlatformSignalChangeType change_type)
 		return "removed";
 	default:
 		g_return_val_if_reached ("UNKNOWN");
-		return "UNKNOWN";
 	}
 }
 
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c
index 4c777cce34..59a770c63f 100644
--- a/src/platform/tests/test-common.c
+++ b/src/platform/tests/test-common.c
@@ -31,7 +31,6 @@ _change_type_to_string (NMPlatformSignalChangeType change_type)
         return "removed";
     default:
         g_return_val_if_reached ("UNKNOWN");
-        return "UNKNOWN";
     }
 }