diff --git a/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php b/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
index 1121dfb14a..b098a07ddd 100644
--- a/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
+++ b/src/applications/auth/controller/PhabricatorAuthNeedsApprovalController.php
@@ -51,7 +51,7 @@ final class PhabricatorAuthNeedsApprovalController
       $viewer,
       PhabricatorAuthWaitForApprovalMessageType::MESSAGEKEY);
 
-    if (!strlen($text)) {
+    if (!phutil_nonempty_string($text)) {
       return null;
     }
 
diff --git a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
index a1fec4a6d2..0efb1fe4fc 100644
--- a/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthPasswordEngine.php
@@ -150,6 +150,8 @@ final class PhabricatorAuthPasswordEngine
     $base_uri = new PhutilURI($base_uri);
     $blocklist[] = $base_uri->getDomain();
 
+    $blocklist = array_filter($blocklist);
+
     // Generate additional subterms by splitting the raw blocklist on
     // characters like "@", " " (space), and "." to break up email addresses,
     // readable names, and domain names into components.
diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
index c41148a4aa..37f9e808ab 100644
--- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
+++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomField.php
@@ -301,7 +301,7 @@ abstract class PhabricatorStandardCustomField
   }
 
   public function renderPropertyViewValue(array $handles) {
-    if (!strlen($this->getFieldValue())) {
+    if (!phutil_nonempty_string($this->getFieldValue())) {
       return null;
     }
     return $this->getFieldValue();