diff --git a/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c b/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c
index 423c7d4dc4..3e85c7195b 100644
--- a/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c
+++ b/src/add-ons/kernel/drivers/bus/firewire/fw_raw.c
@@ -997,6 +997,10 @@ init_driver()
 	}
 	
 	devices = malloc(sizeof(char *) * (devices_count+1));
+	if (!devices) {
+		put_module(FIREWIRE_MODULE_NAME);
+		return ENOMEM;
+	}
 	for (i=0; i<devices_count; i++) {
 		devices[i] = strdup(fwname);
 		snprintf(devices[i], FWNAMEMAX, fwname, i);
@@ -1016,6 +1020,7 @@ uninit_driver()
 		free(devices[i]);
 	}
 	free(devices);
+	devices = NULL;
 
 	put_module(FIREWIRE_MODULE_NAME);
 }