diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 4ec44258e4ff017bb7ed45a6fa213e49c29f8317..a17619bfb57b5298c1fd196a8ad3512a049ac0d2 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -293,7 +293,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler)
 	if (acpi_disabled)
 		return -ENODEV;
 
-	if (!handler)
+	if (!id || !handler)
 		return -EINVAL;
 
 	if (strncmp(id, ACPI_SIG_MADT, 4) == 0)