diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index 4cd735671d..f8b282e820 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -5580,9 +5580,9 @@ user_memcpy(void* to, const void* from, size_t size)
 ssize_t
 user_strlcpy(char* to, const char* from, size_t size)
 {
-	if (size == 0)
-		return 0;
-	if (from == NULL || to == NULL)
+	if (to == NULL && size != 0)
+		return B_BAD_VALUE;
+	if (from == NULL)
 		return B_BAD_ADDRESS;
 
 	// limit size to avoid address overflows