diff --git a/src/apps/powerstatus/ExtendedInfoWindow.cpp b/src/apps/powerstatus/ExtendedInfoWindow.cpp
index 6335dd3e12..2f693e05fe 100644
--- a/src/apps/powerstatus/ExtendedInfoWindow.cpp
+++ b/src/apps/powerstatus/ExtendedInfoWindow.cpp
@@ -137,10 +137,14 @@ BatteryInfoView::_FillStringList()
 	else if (fBatteryInfo.state & BATTERY_DISCHARGING)
 		fontString->string = B_TRANSLATE("Battery discharging");
 	else if (fBatteryInfo.state & BATTERY_CRITICAL_STATE
-		&& !strcmp(fBatteryExtendedInfo.model_number, "")
-		&& !strcmp(fBatteryExtendedInfo.serial_number, "")
-		&& !strcmp(fBatteryExtendedInfo.type, "")
-		&& !strcmp(fBatteryExtendedInfo.oem_info, ""))
+		&& (!fBatteryExtendedInfo.model_number
+			|| !strlen(fBatteryExtendedInfo.model_number))
+		&& (!fBatteryExtendedInfo.serial_number
+			|| !strlen(fBatteryExtendedInfo.serial_number))
+		&& (!fBatteryExtendedInfo.type
+			|| !strlen(fBatteryExtendedInfo.type))
+		&& (!fBatteryExtendedInfo.oem_info
+			|| !strlen(fBatteryExtendedInfo.oem_info)))
 		fontString->string = B_TRANSLATE("Empty battery slot");
 	else if (fBatteryInfo.state & BATTERY_CRITICAL_STATE)
 		fontString->string = B_TRANSLATE("Damaged battery");