diff --git a/src/add-ons/kernel/file_systems/packagefs/util/String.h b/src/add-ons/kernel/file_systems/packagefs/util/String.h
index 3025e972df..4c6104d593 100644
--- a/src/add-ons/kernel/file_systems/packagefs/util/String.h
+++ b/src/add-ons/kernel/file_systems/packagefs/util/String.h
@@ -64,7 +64,7 @@ String::~String()
 inline bool
 String::SetTo(const char* string)
 {
-	return SetToExactLength(string, strlen(string));
+	return SetToExactLength(string, (string == NULL) ? 0 : strlen(string));
 }