diff --git a/src/device.c b/src/device.c
index 6fadc901b..b9dba8fd6 100644
--- a/src/device.c
+++ b/src/device.c
@@ -186,7 +186,8 @@ device_add_common(const device_t *dev, void *p, void *params, int inst)
                 devices[c]     = NULL;
                 device_priv[c] = NULL;
 
-                free(init_dev);
+                if (init_dev != NULL)
+                    free(init_dev);
 
                 return (NULL);
             }