diff --git a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp
index ed397180d7..c5a15f627b 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp
+++ b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp
@@ -2038,8 +2038,11 @@ ep_initialize(int fd, partition_id partitionID, const char* name,
 
 	// get partition
 	partition_data* partition = get_partition(partitionID);
+	if (!partition)
+		return B_BAD_VALUE;
+
 	PrimaryPartition* primary = (PrimaryPartition*)partition->cookie;
-	if (!partition || !primary)
+	if (!primary)
 		return B_BAD_VALUE;
 
 	// name is ignored - we cannot set it to the Intel Extended Partition