diff --git a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
index eeceeabda3..fa85fbeb09 100644
--- a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
+++ b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp
@@ -114,7 +114,7 @@ ExtendedPartitionAddOn::ValidateInitialize(const BMutablePartition* partition,
 	BString* name, const char* parameters)
 {
 	if (!CanInitialize(partition)
-		|| (parameters != NULL && strlen(parameters) > 0)) {
+		|| (parameters != NULL && parameters[0] != '\0')) {
 		return B_BAD_VALUE;
 	}
 
@@ -132,8 +132,8 @@ ExtendedPartitionAddOn::Initialize(BMutablePartition* partition,
 	const char* name, const char* parameters, BPartitionHandle** _handle)
 {
 	if (!CanInitialize(partition)
-		|| (name != NULL && strlen(name) > 0)
-		|| (parameters != NULL && strlen(parameters) > 0)) {
+		|| (name != NULL && name[0] != '\0')
+		|| (parameters != NULL && parameters[0] != '\0')) {
 		return B_BAD_VALUE;
 	}
 
@@ -448,7 +448,7 @@ ExtendedPartitionHandle::CreateChild(off_t offset, off_t size,
 		return B_BAD_VALUE;
 
 	// check name
-	if (name && strlen(name) > 0)
+	if (name != NULL && name[0] != '\0')
 		return B_BAD_VALUE;
 
 	// offset properly aligned?
diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
index 1d59c5cf3e..6731e8b183 100644
--- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
+++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
@@ -114,7 +114,7 @@ PartitionMapAddOn::ValidateInitialize(const BMutablePartition* partition,
 	BString* name, const char* parameters)
 {
 	if (!CanInitialize(partition)
-		|| (parameters != NULL && strlen(parameters) > 0)) {
+		|| (parameters != NULL && parameters[0] != '\0')) {
 		return B_BAD_VALUE;
 	}
 
@@ -132,8 +132,8 @@ PartitionMapAddOn::Initialize(BMutablePartition* partition, const char* name,
 	const char* parameters, BPartitionHandle** _handle)
 {
 	if (!CanInitialize(partition)
-		|| (name != NULL && strlen(name) > 0)
-		|| (parameters != NULL && strlen(parameters) > 0)) {
+		|| (name != NULL && name[0] != '\0')
+		|| (parameters != NULL && parameters[0] != '\0')) {
 		return B_BAD_VALUE;
 	}