diff --git a/common/xfpm-power-common.c b/common/xfpm-power-common.c
index c9df21e2abb5c431cf119b7b3eabec9f56167554..cc3c34d108087227d1165d8af21d04456a99033d 100644
--- a/common/xfpm-power-common.c
+++ b/common/xfpm-power-common.c
@@ -252,6 +252,11 @@ get_device_description (UpClient *upower, UpDevice *device)
         model = g_strdup ("");
     }
 
+    if (vendor == NULL)
+        vendor = g_strdup ("");
+    if (model == NULL)
+        model = g_strdup ("");
+
     /* If we get a vendor or model we can use it, otherwise translate the
      * device type into something readable (works for things like ac_power)
      */